From adf9e5009d188f0efc0a009d0c17028aa73df69c Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 30 Jan 2018 10:22:18 +0100 Subject: [PATCH] */*: remove _opnsense_bootup_run PR: https://github.com/opnsense/core/issues/1835 (cherry picked from commit 8ebb3bd46593d7c518c2f8f5373dca7569945b6e) --- .../src/opnsense/service/templates/OPNsense/Redis/redis | 3 +-- .../opnsense/service/templates/OPNsense/Postfix/postfix | 1 - .../opnsense/service/templates/OPNsense/Collectd/collectd | 1 - .../service/templates/OPNsense/ZabbixAgent/rc.conf.d | 7 +++---- .../service/templates/OPNsense/Zabbixproxy/zabbix_proxy | 1 - net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr | 1 - .../opnsense/service/templates/OPNsense/HAProxy/rc.conf.d | 1 - .../src/opnsense/service/templates/OPNsense/Quagga/quagga | 1 - .../opnsense/service/templates/OPNsense/Siproxd/siproxd | 1 - .../service/templates/OPNsense/AcmeClient/rc.conf.d | 1 - .../service/templates/OPNsense/ClamAV/clamav_clamd | 1 - .../service/templates/OPNsense/ClamAV/clamav_freshclam | 1 - .../tor/src/opnsense/service/templates/OPNsense/Tor/tor | 1 - .../opnsense/service/templates/OPNsense/Monit/rc.conf.d | 1 - .../nut/src/opnsense/service/templates/OPNsense/Nut/nut | 1 - .../src/opnsense/service/templates/OPNsense/CICAP/c_icap | 1 - 16 files changed, 4 insertions(+), 20 deletions(-) diff --git a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis index e49af1e3e..57fe4d247 100644 --- a/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis +++ b/databases/redis/src/opnsense/service/templates/OPNsense/Redis/redis @@ -1,7 +1,6 @@ {% 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" +redis_enable="YES" {% 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 46a79c289..1d2cfd855 100644 --- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix +++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix @@ -1,5 +1,4 @@ {% 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 %} 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 e97f8c184..cf5949f7d 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,4 @@ {% 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 %} 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 80ac56e63..462754dbc 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,8 +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" +zabbix_agentd_config="/usr/local/etc/zabbix_agentd.conf" +zabbix_agentd_enable="YES" {% else %} -zabbix_agentd_enable=NO +zabbix_agentd_enable="NO" {% endif %} -zabbix_agentd_config=/usr/local/etc/zabbix_agentd.conf 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 e587c4ced..f9c1bb348 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,4 @@ {% 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 %} diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr index 1c01bb07d..87ea4e79c 100644 --- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr +++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr @@ -2,7 +2,6 @@ defaultrouter="NO" frr_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}YES{% else %}NO{% endif %}" {% 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 %} 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 cb13e6fc7..fab73298e 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,5 @@ {% 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" diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga index 94353749a..2e6709c8a 100644 --- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga +++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga @@ -2,7 +2,6 @@ defaultrouter="NO" quagga_enable="{% if helpers.exists('OPNsense.quagga.general.enabled') and OPNsense.quagga.general.enabled == '1' %}YES{% else %}NO{% endif %}" {% 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 %} diff --git a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd index 7b76c5702..9c3277f96 100644 --- a/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd +++ b/net/siproxd/src/opnsense/service/templates/OPNsense/Siproxd/siproxd @@ -1,5 +1,4 @@ {% 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 %} 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 c146de953..b43c75151 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 @@ -2,7 +2,6 @@ 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 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 ace935cce..271642d42 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,4 @@ {% 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 %} 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 fa7154248..7315a1ae4 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,4 @@ {% 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 %} diff --git a/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor index ff742adf0..5816e2602 100644 --- a/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor +++ b/security/tor/src/opnsense/service/templates/OPNsense/Tor/tor @@ -1,5 +1,4 @@ {% if helpers.exists('OPNsense.tor.general.enabled') and OPNsense.tor.general.enabled == '1' %} -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 %} 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 d83bf9c7f..d19dee084 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,6 +1,5 @@ # 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_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 %} diff --git a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut index f41bd9b00..8015ac6dd 100644 --- a/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut +++ b/sysutils/nut/src/opnsense/service/templates/OPNsense/Nut/nut @@ -1,5 +1,4 @@ {% if helpers.exists('OPNsense.Nut.general.enable') and OPNsense.Nut.general.enable == '1' %} -nut_opnsense_bootup_run="/usr/local/opnsense/scripts/OPNsense/Nut/setup.sh" nut_var_script="/usr/local/opnsense/scripts/OPNsense/Nut/setup.sh" nut_enable="YES" {% else %} 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 90311d512..4be32766d 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,4 @@ {% 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 %}