From 8c3a087db1413528fea953ee5d0cd5d6fbc75312 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 21 Oct 2022 10:16:04 +0200 Subject: [PATCH] net-mgmt/zabbix-proxy: use NAME_setup PR: https://github.com/opnsense/core/issues/5917 --- .../service/conf/actions.d/actions_zabbixproxy.conf | 8 ++++---- .../service/templates/OPNsense/Zabbixproxy/zabbix_proxy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf b/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf index 7904a1445..de02101fd 100644 --- a/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf +++ b/net-mgmt/zabbix-proxy/src/opnsense/service/conf/actions.d/actions_zabbixproxy.conf @@ -1,23 +1,23 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy start +command:/usr/local/etc/rc.d/zabbix_proxy start parameters: type:script message:starting Zabbix Proxy [stop] -command:/usr/local/etc/rc.d/zabbix_proxy stop; exit 0 +command:/usr/local/etc/rc.d/zabbix_proxy stop parameters: type:script message:stopping Zabbix Proxy [restart] -command:/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh;/usr/local/etc/rc.d/zabbix_proxy restart +command:/usr/local/etc/rc.d/zabbix_proxy restart parameters: type:script message:restarting Zabbix Proxy [status] -command:/usr/local/etc/rc.d/zabbix_proxy status;exit 0 +command:/usr/local/etc/rc.d/zabbix_proxy status; exit 0 parameters: type:script_output message:request Zabbix Proxy status 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 f9c1bb348..feb35290d 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,5 @@ {% if helpers.exists('OPNsense.zabbixproxy.general.enabled') and OPNsense.zabbixproxy.general.enabled == '1' %} -zabbix_proxy_var_script="/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh" +zabbix_proxy_setup="/usr/local/opnsense/scripts/OPNsense/Zabbixproxy/setup.sh" zabbix_proxy_enable="YES" {% else %} zabbix_proxy_enable="NO"