From 3f84a7f6f65080ecd95b0d9118408e09a55342de Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 21 Oct 2022 10:18:58 +0200 Subject: [PATCH] net-mgmt/zabbix-agent: use NAME_setup PR: https://github.com/opnsense/core/issues/5917 --- .../opnsense/service/conf/actions.d/actions_zabbixagent.conf | 4 ++-- .../opnsense/service/templates/OPNsense/ZabbixAgent/rc.conf.d | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/conf/actions.d/actions_zabbixagent.conf b/net-mgmt/zabbix-agent/src/opnsense/service/conf/actions.d/actions_zabbixagent.conf index d95fb2da2..31200b3b7 100644 --- a/net-mgmt/zabbix-agent/src/opnsense/service/conf/actions.d/actions_zabbixagent.conf +++ b/net-mgmt/zabbix-agent/src/opnsense/service/conf/actions.d/actions_zabbixagent.conf @@ -1,5 +1,5 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/ZabbixAgent/setup.sh; /usr/local/etc/rc.d/zabbix_agentd start +command:/usr/local/etc/rc.d/zabbix_agentd start parameters: type:script message:starting zabbix_agentd @@ -11,7 +11,7 @@ type:script message:stopping zabbix_agentd [restart] -command:/usr/local/opnsense/scripts/OPNsense/ZabbixAgent/setup.sh; /usr/local/etc/rc.d/zabbix_agentd restart +command:/usr/local/etc/rc.d/zabbix_agentd restart parameters: type:script description:Restart Zabbix Agent 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 462754dbc..b119808fa 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,5 +1,5 @@ {% if helpers.exists('OPNsense.ZabbixAgent.settings.main.enabled') and OPNsense.ZabbixAgent.settings.main.enabled|default("0") == "1" %} -zabbix_agentd_var_script="/usr/local/opnsense/scripts/OPNsense/ZabbixAgent/setup.sh" +zabbix_agentd_setup="/usr/local/opnsense/scripts/OPNsense/ZabbixAgent/setup.sh" zabbix_agentd_config="/usr/local/etc/zabbix_agentd.conf" zabbix_agentd_enable="YES" {% else %}