From 6ed7455d9b8b592437cdca2bbfe10be1e26f67d7 Mon Sep 17 00:00:00 2001
From: Manus Freedom <manus@manusfreedom.com>
Date: Tue, 7 Jun 2016 22:50:25 +0200
Subject: [PATCH] Add custom options in General Settings/Default Parameters

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

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
index 196da4983..5e4d58937 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/main.xml
@@ -118,6 +118,13 @@
                 <type>dropdown</type>
                 <help><![CDATA[Enable or disable session redistribution in case of connection failure.]]></help>
             </field>
+            <field>
+                <id>haproxy.general.defaults.customOptions</id>
+                <label>Custom options</label>
+                <type>textbox</type>
+                <help><![CDATA[These lines will be added to the defaults settings of to the HAProxy configuration file.<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>
         </subtab>
         <subtab id="haproxy-general-logging" description="Logging Configuration">
             <field>
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 fe42c9437..d28bfeaea 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
@@ -114,6 +114,9 @@
                         <x-3>redispatch on the 3rd retry prior to the last retry</x-3>
                     </OptionValues>
                 </redispatch>
+                <customOptions type="TextField">
+                    <Required>N</Required>
+                </customOptions>
             </defaults>
             <logging>
                 <host type="TextField">
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 abf48885f..34f9989a1 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -523,6 +523,12 @@ defaults
 {%   if OPNsense.HAProxy.general.defaults.retries|default("") != "" %}
     retries {{OPNsense.HAProxy.general.defaults.retries}}
 {%   endif %}
+{%   if OPNsense.HAProxy.general.defaults.customOptions|default("") != "" %}
+    # WARNING: pass through options below this line
+{%     for customOpt in OPNsense.HAProxy.general.defaults.customOptions.split("\n") %}
+    {{customOpt}}
+{%     endfor %}
+{%   endif %}
 {% endif %}
 
 {# ############################### #}