From 48c75b1cef850aa87b133b65a1171e23b87411ce Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 15 Nov 2016 22:27:34 +0100
Subject: [PATCH] net/haproxy: add support for advanced server options

---
 .../controllers/OPNsense/HAProxy/forms/dialogServer.xml    | 7 +++++++
 .../opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml   | 3 +++
 .../service/templates/OPNsense/HAProxy/haproxy.conf        | 4 ++++
 3 files changed, 14 insertions(+)

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 bfa340571..90306c092 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
@@ -94,4 +94,11 @@
         <help><![CDATA[Sets the source address which will be used when connecting to the server.]]></help>
         <advanced>true</advanced>
     </field>
+    <field>
+        <id>server.advanced</id>
+        <label>Advanced options</label>
+        <type>text</type>
+        <help><![CDATA[A list of parameters that will be appended to the server line in every backend where this is will be used.<br/>Example: send-proxy<br/><div class="text-info"><b>NOTE:</b> The syntax will not be checked, use at your own risk!</div>.]]></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 3f71ce11d..a9cfc9477 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
@@ -612,6 +612,9 @@
                     <ValidationMessage>Please specify a valid source address, i.e. 10.0.0.1 or loadbalancer.example.com:50000. Port range as start-end, i.e. 10.0.0.1:50000-60000.</ValidationMessage>
                     <Required>N</Required>
                 </source>
+                <advanced type="TextField">
+                    <Required>N</Required>
+                </advanced>
             </server>
         </servers>
         <healthchecks>
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 4b2946f20..ca33c3408 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -837,6 +837,10 @@ backend {{backend.name}}
 {%           do server_options.append('source ' ~ backend.source) %}
 {%         elif server_data.source|default("") != "" %}
 {%           do server_options.append('source ' ~ server_data.source) %}
+{%         endif %}
+{#         # server advanced options #}
+{%         if server_data.advanced|default("") != "" %}
+{%           do server_options.append(server_data.advanced) %}
 {%         endif %}
     server {{server_data.name}} {{server_data.address}}:{% if backend.tuning_noport != '1' %}{{server_data.port}}{% endif %} {{server_options|join(' ')}}
 {%       endfor %}