From 6b9cadab8e383c8a0e2cf6b1cf8332c040723e2b Mon Sep 17 00:00:00 2001
From: Manus Freedom <manus@manusfreedom.com>
Date: Tue, 7 Jun 2016 22:37:58 +0200
Subject: [PATCH] Set backend.tuning_defaultserver as advanced Add no port
 support in backend server Add port to check in server

---
 .../OPNsense/HAProxy/forms/dialogBackend.xml          |  8 ++++++++
 .../OPNsense/HAProxy/forms/dialogServer.xml           |  7 +++++++
 .../mvc/app/models/OPNsense/HAProxy/HAProxy.xml       | 11 +++++++++++
 .../service/templates/OPNsense/HAProxy/haproxy.conf   |  2 +-
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index 35fe42dac..747128fbb 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -135,6 +135,14 @@
         <label>Default for server</label>
         <type>text</type>
         <help><![CDATA[Default option for all server entries.]]></help>
+        <advanced>true</advanced>
+    </field>
+    <field>
+        <id>backend.tuning_noport</id>
+        <label>Don't use port on server</label>
+        <type>checkbox</type>
+        <help><![CDATA[Don't use port on server, use the same port as frontend receive. If check enable, require port check in server.]]></help>
+        <advanced>true</advanced>
     </field>
     <field>
         <label>Actions (ACLs)</label>
diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogServer.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogServer.xml
index 1a399cb2b..5bdcb978c 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogServer.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogServer.xml
@@ -51,4 +51,11 @@
         <help><![CDATA[Sets the interval (in milliseconds) for running health checks on the server.]]></help>
         <advanced>true</advanced>
     </field>
+    <field>
+        <id>server.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>
 </form>
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 4e76cbdf1..fe42c9437 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
@@ -479,6 +479,10 @@
                 <tuning_defaultserver type="TextField">
                     <Required>N</Required>
                 </tuning_defaultserver>
+                <tuning_noport type="BooleanField">
+                    <default>0</default>
+                    <Required>Y</Required>
+                </tuning_noport>
                 <linkedActions type="ModelRelationField">
                     <Model>
                         <template>
@@ -529,6 +533,13 @@
                     <ValidationMessage>Please specify a value between 1 and 65535.</ValidationMessage>
                     <Required>Y</Required>
                 </port>
+                <checkport type="IntegerField">
+                    <default>80</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
+                    <ValidationMessage>Please specify a value between 1 and 65535.</ValidationMessage>
+                    <Required>N</Required>
+                </checkport>
                 <mode type="OptionField">
                     <Required>Y</Required>
                     <default>active</default>
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 a4145c3a0..abf48885f 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -768,7 +768,7 @@ backend {{backend.name}}
 {%         do server_options.append('weight ' ~ server_data.weight) if server_data.weight|default("") != "" %}
 {#         # server role/mode #}
 {%         do server_options.append(server_data.mode) if server_data.mode|default("") != "active" %}
-    server {{server_data.name}} {{server_data.address}}:{{server_data.port}} {{server_options|join(' ')}}
+    server {{server_data.name}} {{server_data.address}}:{% if backend.tuning_noport != '1' %}{{server_data.port}}{% endif %}{% if server_data.checkport|default("") != "" %} port {{server_data.checkport}}{% endif %} {{server_options|join(' ')}}
 {%       endfor %}
 
 {%     else %}