From 472d5d601e26f9dd79cc7fa72d7603f89097b631 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Tue, 8 Aug 2017 00:40:01 +0200
Subject: [PATCH 1/3] net/haproxy: enable hard stop mode by default, fixes #195

---
 net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart        | 7 +++++++
 net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop           | 7 +++++++
 .../mvc/app/controllers/OPNsense/HAProxy/forms/main.xml    | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml   | 4 ++++
 .../opnsense/service/conf/actions.d/actions_haproxy.conf   | 4 ++--
 .../opnsense/service/templates/OPNsense/HAProxy/rc.conf.d  | 6 +++++-
 6 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100755 net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart
 create mode 100755 net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop

diff --git a/net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart
new file mode 100755
index 000000000..2784d4384
--- /dev/null
+++ b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. /etc/rc.conf.d/haproxy
+
+if [ "x${haproxy_hardstop}" == "xYES" ]; then
+    /usr/local/etc/rc.d/haproxy configtest && /usr/local/etc/rc.d/haproxy hardstop
+fi
diff --git a/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop
new file mode 100755
index 000000000..cac76c6b6
--- /dev/null
+++ b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+. /etc/rc.conf.d/haproxy
+
+if [ "x${haproxy_hardstop}" == "xYES" ]; then
+    /usr/local/etc/rc.d/haproxy hardstop
+fi
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 33aa176c7..66a0b4b57 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
@@ -11,6 +11,12 @@
                 <type>checkbox</type>
                 <help>Enable or disable the HAProxy service.</help>
             </field>
+            <field>
+                <id>haproxy.general.gracefulStop</id>
+                <label>Graceful Stop</label>
+                <type>checkbox</type>
+                <help><![CDATA[Enable HAProxy's graceful stop mode. In this mode HAProxy will continue to process existing connections until they close. Note that this may severely slow down HAProxy's shutdown, depending on the configured timeout values. If graceful stop mode is not enabled, HAProxy will use the hard stop mode where it immediately quits and all established connections are closed. Hard stop mode is recommended.]]></help>
+            </field>
         </subtab>
         <subtab id="haproxy-general-global" description="Global Parameters">
             <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 aed80b1e6..dcda4677f 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
@@ -9,6 +9,10 @@
                 <default>0</default>
                 <Required>Y</Required>
             </enabled>
+            <gracefulStop type="BooleanField">
+                <default>0</default>
+                <Required>Y</Required>
+            </gracefulStop>
             <tuning>
                 <root type="BooleanField">
                     <default>0</default>
diff --git a/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf b/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
index a40d035d7..c68da0d51 100644
--- a/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
+++ b/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
@@ -11,13 +11,13 @@ type:script
 message:starting haproxy
 
 [stop]
-command:/usr/local/etc/rc.d/haproxy stop; /usr/bin/killall haproxy; exit 0
+command:/usr/local/etc/rc.syshook.d/50-haproxy.stop; /usr/local/etc/rc.d/haproxy stop; /usr/bin/killall haproxy; exit 0
 parameters:
 type:script
 message:stopping haproxy
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/etc/rc.d/haproxy restart
+command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/etc/rc.syshook.d/50-haproxy.restart; /usr/local/etc/rc.d/haproxy restart
 parameters:
 type:script
 message:restarting haproxy
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d
index 0d4f4b2f1..44eb42162 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d
@@ -3,7 +3,11 @@ haproxy_enable=YES
 haproxy_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh"
 haproxy_pidfile="/var/run/haproxy.pid"
 haproxy_config="/usr/local/etc/haproxy.conf"
-# haproxy_flags=""
+{% if helpers.exists('OPNsense.HAProxy.general.gracefulStop') and OPNsense.HAProxy.general.gracefulStop|default("0") == "1" %}
+haproxy_hardstop=NO
+{% else %}
+haproxy_hardstop=YES
+{% endif %}
 {% else %}
 haproxy_enable=NO
 {% endif %}

From 2f875dc2cc785ca8a5fcb21f4932c735fb94a3b8 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 16 Aug 2017 12:11:28 +0200
Subject: [PATCH 2/3] net/haproxy: use rc wrapper script to set hard/graceful
 mode, refs #195

---
 .../src/etc/rc.syshook.d/50-haproxy.restart       |  7 -------
 net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop  |  6 +-----
 .../scripts/OPNsense/HAProxy/rc-wrapper.sh        | 15 +++++++++++++++
 .../service/conf/actions.d/actions_haproxy.conf   |  8 ++++----
 4 files changed, 20 insertions(+), 16 deletions(-)
 delete mode 100755 net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart
 create mode 100755 net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh

diff --git a/net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart
deleted file mode 100755
index 2784d4384..000000000
--- a/net/haproxy/src/etc/rc.syshook.d/50-haproxy.restart
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf.d/haproxy
-
-if [ "x${haproxy_hardstop}" == "xYES" ]; then
-    /usr/local/etc/rc.d/haproxy configtest && /usr/local/etc/rc.d/haproxy hardstop
-fi
diff --git a/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop
index cac76c6b6..e05a629cd 100755
--- a/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop
+++ b/net/haproxy/src/etc/rc.syshook.d/50-haproxy.stop
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-. /etc/rc.conf.d/haproxy
-
-if [ "x${haproxy_hardstop}" == "xYES" ]; then
-    /usr/local/etc/rc.d/haproxy hardstop
-fi
+/usr/local/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh stop
diff --git a/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh
new file mode 100755
index 000000000..163448ab3
--- /dev/null
+++ b/net/haproxy/src/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ -f /etc/rc.conf.d/haproxy ]; then
+. /etc/rc.conf.d/haproxy
+fi
+
+case "$1" in
+stop|restart)
+    if [ "${haproxy_hardstop}" == "YES" ]; then
+        rcprefix="hard"
+    fi
+    ;;
+esac
+
+/usr/local/etc/rc.d/haproxy ${rcprefix}${1}
diff --git a/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf b/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
index c68da0d51..1ee61b638 100644
--- a/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
+++ b/net/haproxy/src/opnsense/service/conf/actions.d/actions_haproxy.conf
@@ -5,25 +5,25 @@ type:script_output
 message:setup haproxy service requirements
 
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/etc/rc.d/haproxy start
+command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh start
 parameters:
 type:script
 message:starting haproxy
 
 [stop]
-command:/usr/local/etc/rc.syshook.d/50-haproxy.stop; /usr/local/etc/rc.d/haproxy stop; /usr/bin/killall haproxy; exit 0
+command:/usr/local/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh stop; /usr/bin/killall haproxy; exit 0
 parameters:
 type:script
 message:stopping haproxy
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/etc/rc.syshook.d/50-haproxy.restart; /usr/local/etc/rc.d/haproxy restart
+command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh restart
 parameters:
 type:script
 message:restarting haproxy
 
 [reconfigure]
-command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/etc/rc.d/haproxy reload
+command:/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh; /usr/local/opnsense/scripts/OPNsense/HAProxy/rc-wrapper.sh reload
 parameters:
 type:script
 message:reconfiguring haproxy

From e2c45b7904b0011f0788d27a0a1e890bdfc345e2 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Wed, 16 Aug 2017 12:22:14 +0200
Subject: [PATCH 3/3] net/haproxy: bump model version

---
 .../src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml     | 1 +
 1 file changed, 1 insertion(+)

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 dcda4677f..e33063dea 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
@@ -1,5 +1,6 @@
 <model>
     <mount>//OPNsense/HAProxy</mount>
+    <version>1.0.0</version>
     <description>
         the HAProxy load balancer
     </description>