From f14eebe9e2e97edf790d5616d3650aca1bfcb812 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Mon, 13 Jun 2016 16:57:10 +0200
Subject: [PATCH] net/haproxy: new option "checkport" for health checks

---
 .../OPNsense/HAProxy/forms/dialogHealthcheck.xml       |  7 +++++++
 .../mvc/app/models/OPNsense/HAProxy/HAProxy.xml        |  9 ++++++++-
 .../service/templates/OPNsense/HAProxy/haproxy.conf    | 10 ++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml
index 27b397f94..3c3e1dae4 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml
@@ -23,6 +23,13 @@
         <type>text</type>
         <help><![CDATA[Select interval (in milliseconds) between two consecutive health checks.]]></help>
     </field>
+    <field>
+        <id>healthcheck.checkport</id>
+        <label>Port to check</label>
+        <type>text</type>
+        <help><![CDATA[Provide the TCP communication port to use during check, i.e. 80 or 443.]]></help>
+        <advanced>true</advanced>
+    </field>
     <field>
         <label>HTTP check options</label>
         <type>header</type>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index f537931d2..7f2e10bd6 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -549,7 +549,7 @@
                     <Required>Y</Required>
                 </port>
                 <checkport type="IntegerField">
-                    <default>80</default>
+                    <default></default>
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>65535</MaximumValue>
                     <ValidationMessage>Please specify a value between 1 and 65535.</ValidationMessage>
@@ -624,6 +624,13 @@
                     <ValidationMessage>Please specify a value between 250 and 1000000.</ValidationMessage>
                     <Required>N</Required>
                 </interval>
+                <checkport type="IntegerField">
+                    <default></default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
+                    <ValidationMessage>Please specify a value between 1 and 65535.</ValidationMessage>
+                    <Required>N</Required>
+                </checkport>
                 <!-- XXX: add tag <http> once nesting is supported by our framework -->
                 <http_method type="OptionField">
                     <Required>N</Required>
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index a45bdbc1c..555e688f6 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -763,15 +763,21 @@ backend {{backend.name}}
 {%       if backend.tuning_defaultserver|default("") != "" %}
     default-server {{backend.tuning_defaultserver}}
 {%       endif %}
-
 {%       for server in backend.linkedServers.split(",") %}
 {%         set server_data = helpers.getUUID(server) %}
 {#         # collect optional server parameters #}
 {%         set server_options = [] %}
-{#         # check if health check is enabled # %}
+{#         # check if health check is enabled #}
 {%         if healthcheck_enabled == '1' %}
 {%           do server_options.append('check') %}
 {%           do server_options.append('inter ' ~ server_data.checkInterval) %}
+{#           # use a different port for health check #}
+{%           if healthcheck_data.checkport|default("") != "" %}
+{#             # prefer port from health check template #}
+{%             do server_options.append('port ' ~ healthcheck_data.checkport) %}
+{%           elif server_data.checkport|default("") != "" %}
+{%             do server_options.append('port ' ~ server_data.checkport) %}
+{%           endif %}
 {#           # add all additions from healthchecks here #}
 {%           do server_options.append(healthcheck_additions|join(' ')) if healthcheck_additions.length != '0' %}
 {%         endif %}