From d1b102cc1b52dc8f9b8761c639cfa5ae0baa6be6 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 14 Jun 2016 11:44:38 +0200
Subject: [PATCH] net/haproxy: remove chroot GUI option, always enable chroot

---
 .../mvc/app/controllers/OPNsense/HAProxy/forms/main.xml     | 6 ------
 .../opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml    | 4 ----
 .../service/templates/OPNsense/HAProxy/haproxy.conf         | 2 --
 3 files changed, 12 deletions(-)

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 4cfb337e2..886eed24d 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
@@ -24,12 +24,6 @@
                 <help><![CDATA[Enable or disable HAProxy running as root.<br/><div class="text-info"><b>NOTE:</b> Enabling root could be a security issue but it's required by some feature.</div>]]></help>
                 <advanced>true</advanced>
             </field>
-            <field>
-                <id>haproxy.general.tuning.chroot</id>
-                <label>Secure mode (chroot)</label>
-                <type>checkbox</type>
-                <help><![CDATA[Enable or disable HAProxy's chroot feature.]]></help>
-            </field>
             <field>
                 <id>haproxy.general.tuning.nbproc</id>
                 <label>HAProxy processes</label>
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 a0bfbc908..584645996 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
@@ -14,10 +14,6 @@
                     <default>0</default>
                     <Required>Y</Required>
                 </root>
-                <chroot type="BooleanField">
-                    <default>1</default>
-                    <Required>Y</Required>
-                </chroot>
                 <maxConnections type="IntegerField">
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>500000</MaximumValue>
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 184b358f3..5c126e054 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -446,9 +446,7 @@ global
     uid                         80
 {% endif %}
     gid                         80
-{% if OPNsense.HAProxy.general.tuning.chroot == "1" %}
     chroot                      /var/run/haproxy
-{% endif %}
     daemon
     stats                       socket /var/run/haproxy.socket level admin
     nbproc                      {{OPNsense.HAProxy.general.tuning.nbproc}}