*/*: migrate _opnsense_bootup_run to simpler _var_script suffix

PR: https://github.com/opnsense/core/issues/1835
This commit is contained in:
Franco Fichtner 2017-12-18 18:28:10 +00:00
parent ac5ca7ffb8
commit f695bc25ce
17 changed files with 19 additions and 2 deletions

View File

@ -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 %}

View File

@ -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"

View File

@ -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 %}

View File

@ -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"

View File

@ -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 %}

View File

@ -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"

View File

@ -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"

View File

@ -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{%

View File

@ -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" %}

View File

@ -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{%

View File

@ -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"

View File

@ -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 %}

View File

@ -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"

View File

@ -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"

View File

@ -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 %}

View File

@ -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 %}

View File

@ -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"