From eb0eb24f94771d048dd2a4cb64264ae0b54b1fbc Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 18 Dec 2017 18:28:10 +0000
Subject: [PATCH] */*: migrate _opnsense_bootup_run to simpler _var_script
 suffix

PR: https://github.com/opnsense/core/issues/1835
(cherry picked from commit f695bc25ce79df7dad6bb4201dc3dac1ff54affc)
---
 .../redis/src/opnsense/service/templates/OPNsense/Redis/redis  | 1 +
 .../src/opnsense/service/templates/OPNsense/Postfix/postfix    | 1 +
 .../src/opnsense/service/templates/OPNsense/Rspamd/rspamd      | 1 +
 .../src/opnsense/service/templates/OPNsense/Collectd/collectd  | 1 +
 .../opnsense/service/templates/OPNsense/ZabbixAgent/rc.conf.d  | 1 +
 .../service/templates/OPNsense/Zabbixproxy/zabbix_proxy        | 1 +
 .../src/opnsense/service/templates/OPNsense/Freeradius/radiusd | 1 +
 net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr     | 1 +
 .../src/opnsense/service/templates/OPNsense/HAProxy/rc.conf.d  | 1 +
 .../src/opnsense/service/templates/OPNsense/Quagga/quagga      | 1 +
 .../src/opnsense/service/templates/OPNsense/Siproxd/siproxd    | 1 +
 .../opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d   | 1 +
 .../opnsense/service/templates/OPNsense/ClamAV/clamav_clamd    | 1 +
 .../service/templates/OPNsense/ClamAV/clamav_freshclam         | 1 +
 security/tor/src/opnsense/service/templates/OPNsense/Tor/tor   | 3 ++-
 .../src/opnsense/service/templates/OPNsense/Monit/rc.conf.d    | 3 ++-
 .../src/opnsense/service/templates/OPNsense/CICAP/c_icap       | 1 +
 17 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis
index 647747906..e49af1e3e 100644
--- a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis
+++ b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis
@@ -1,6 +1,7 @@
 {% if helpers.exists('OPNsense.redis.general.enabled') and OPNsense.redis.general.enabled == '1' %}
 redis_enable="YES"
 redis_opnsense_bootup_run="/usr/local/opnsense/scripts/redis/setup.sh"
+redis_var_script="/usr/local/opnsense/scripts/redis/setup.sh"
 {% else %}
 redis_enable="NO"
 {% endif %}
diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix
index cf34c5829..46a79c289 100644
--- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix
+++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.postfix.general.enabled') and OPNsense.postfix.general.enabled == '1' %}
 postfix_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Postfix/setup.sh"
+postfix_var_script="/usr/local/opnsense/scripts/OPNsense/Postfix/setup.sh"
 postfix_enable="YES"
 {% else %}
 postfix_enable="NO"
diff --git a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/rspamd b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/rspamd
index bb02f63f2..68560277f 100644
--- a/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/rspamd
+++ b/mail/rspamd/src/opnsense/service/templates/OPNsense/Rspamd/rspamd
@@ -1,6 +1,7 @@
 {% if helpers.exists('OPNsense.Rspamd.general.enabled') and OPNsense.Rspamd.general.enabled == '1' %}
 rspamd_enable="YES"
 rspamd_opnsense_bootup_run="/usr/local/opnsense/scripts/rspamd/setup.sh"
+rspamd_var_script="/usr/local/opnsense/scripts/rspamd/setup.sh"
 {% else %}
 rspamd_enable="NO"
 {% endif %}
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd
index c59a69db1..e97f8c184 100644
--- a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd
+++ b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.collectd.general.enabled') and OPNsense.collectd.general.enabled == '1' %}
 collectd_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh"
+collectd_var_script="/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh"
 collectd_enable="YES"
 {% else %}
 collectd_enable="NO"
diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/rc.conf.d b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/rc.conf.d
index 2e9281997..80ac56e63 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/rc.conf.d
+++ b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/rc.conf.d
@@ -1,6 +1,7 @@
 {% if helpers.exists('OPNsense.ZabbixAgent.settings.main.enabled') and OPNsense.ZabbixAgent.settings.main.enabled|default("0") == "1" %}
 zabbix_agentd_enable=YES
 zabbix_agentd_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/ZabbixAgent/setup.sh"
+zabbix_agentd_var_script="/usr/local/opnsense/scripts/OPNsense/ZabbixAgent/setup.sh"
 {% else %}
 zabbix_agentd_enable=NO
 {% endif %}
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy
index 05ec4c26f..e587c4ced 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy
+++ b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.zabbixproxy.general.enabled') and OPNsense.zabbixproxy.general.enabled == '1' %}
 zabbix_proxy_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh"
+zabbix_proxy_var_script="/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh"
 zabbix_proxy_enable="YES"
 {% else %}
 zabbix_proxy_enable="NO"
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd
index 9ca97b55d..e65dfab62 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.freeradius.general.enabled') and OPNsense.freeradius.general.enabled == '1' %}
 radiusd_opnsense_bootup_run="/usr/local/opnsense/scripts/Freeradius/setup.sh"
+radiusd_var_script="/usr/local/opnsense/scripts/Freeradius/setup.sh"
 radiusd_enable="YES"
 {% else %}
 radiusd_enable="NO"
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
index 9f58b4962..1c01bb07d 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
@@ -3,6 +3,7 @@ frr_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense
 
 {% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}
 frr_opnsense_bootup_run="/usr/local/opnsense/scripts/quagga/setup.sh"
+frr_var_script="/usr/local/opnsense/scripts/quagga/setup.sh"
 {% endif %}
 
 frr_daemons="zebra{%
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 44eb42162..cb13e6fc7 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
@@ -1,6 +1,7 @@
 {% if helpers.exists('OPNsense.HAProxy.general.enabled') and OPNsense.HAProxy.general.enabled|default("0") == "1" %}
 haproxy_enable=YES
 haproxy_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh"
+haproxy_var_script="/usr/local/opnsense/scripts/OPNsense/HAProxy/setup.sh"
 haproxy_pidfile="/var/run/haproxy.pid"
 haproxy_config="/usr/local/etc/haproxy.conf"
 {% if helpers.exists('OPNsense.HAProxy.general.gracefulStop') and OPNsense.HAProxy.general.gracefulStop|default("0") == "1" %}
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
index b47dee7f0..94353749a 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga
@@ -3,6 +3,7 @@ quagga_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNse
 
 {% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}
 quagga_opnsense_bootup_run="/usr/local/opnsense/scripts/quagga/setup.sh"
+quagga_var_script="/usr/local/opnsense/scripts/quagga/setup.sh"
 {% endif %}
 
 quagga_daemons="zebra{%
diff --git a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd
index b04b5e856..7b76c5702 100644
--- a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd
+++ b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.siproxd.general.enabled') and OPNsense.siproxd.general.enabled == '1' %}
 siproxd_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Siproxd/setup.sh"
+siproxd_var_script="/usr/local/opnsense/scripts/OPNsense/Siproxd/setup.sh"
 siproxd_enable="YES"
 {% else %}
 siproxd_enable="NO"
diff --git a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d
index 2f3a3ce7e..c146de953 100644
--- a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d
+++ b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/rc.conf.d
@@ -3,6 +3,7 @@ acme_http_challenge_enable=YES
 acme_http_challenge_conf="/var/etc/lighttpd-acme-challenge.conf"
 acme_http_challenge_pidfile="/var/run/lighttpd-acme-challenge.pid"
 acme_http_challenge_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/AcmeClient/setup.sh"
+acme_http_challenge_var_script="/usr/local/opnsense/scripts/OPNsense/AcmeClient/setup.sh"
 {% else %}
 acme_http_challenge_enable=NO
 {% endif %}
diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd
index 3c103ab53..ace935cce 100644
--- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd
+++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.clamav.general.enabled') and OPNsense.clamav.general.enabled == '1' %}
 clamav_clamd_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
+clamav_clamd_var_script="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
 clamav_clamd_enable="YES"
 {% else %}
 clamav_clamd_enable="NO"
diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam
index 5a2db5b5e..fa7154248 100644
--- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam
+++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.clamav.general.fc_enabled') and OPNsense.clamav.general.fc_enabled == '1' %}
 clamav_freshclam_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
+clamav_freshclam_var_script="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
 clamav_freshclam_enable="YES"
 {% else %}
 clamav_freshclam_enable="NO"
diff --git a/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
index 40f2137ca..ff742adf0 100644
--- a/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
+++ b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor
@@ -1,6 +1,7 @@
 {% if helpers.exists('OPNsense.tor.general.enabled') and OPNsense.tor.general.enabled == '1' %}
-tor_enable="YES"
 tor_opnsense_bootup_run="/usr/local/opnsense/scripts/tor/setup.sh"
+tor_var_script="/usr/local/opnsense/scripts/tor/setup.sh"
+tor_enable="YES"
 {% else %}
 tor_enable="NO"
 {% endif %}
diff --git a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d
index dab07c4ef..d83bf9c7f 100644
--- a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d
+++ b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/rc.conf.d
@@ -1,7 +1,8 @@
 # DO NOT EDIT THIS FILE -- OPNsense auto-generated file
 {% if helpers.exists('OPNsense.monit.general.enabled') and OPNsense.monit.general.enabled|default("0") == "1" %}
-monit_enable="YES"
 monit_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh"
+monit_var_script="/usr/local/opnsense/scripts/OPNsense/Monit/setup.sh"
+monit_enable="YES"
 {% else %}
 monit_enable="NO"
 {% endif %}
diff --git a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap
index d1c1b74e4..90311d512 100644
--- a/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap
+++ b/www/c-icap/src/opnsense/service/templates/OPNsense/CICAP/c_icap
@@ -1,5 +1,6 @@
 {% if helpers.exists('OPNsense.cicap.general.enabled') and OPNsense.cicap.general.enabled == '1' %}
 c_icap_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/CICAP/setup.sh"
+c_icap_var_script="/usr/local/opnsense/scripts/OPNsense/CICAP/setup.sh"
 c_icap_enable="YES"
 {% else %}
 c_icap_enable="NO"