From 31b1470959e59740517cd1136ba5ebaa2964ae5d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 30 Aug 2022 13:07:47 +0200 Subject: [PATCH] sysutils/munin-node: convert to NAME_setup use PR: https://github.com/opnsense/core/issues/5917 --- sysutils/munin-node/Makefile | 1 + .../opnsense/service/conf/actions.d/actions_muninnode.conf | 6 +++--- .../service/templates/OPNsense/Muninnode/munin_node | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 0248c7681..43d5c15f8 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= munin-node PLUGIN_VERSION= 1.1 +PLUGIN_REVISION= 1 PLUGIN_COMMENT= Munin monitoring agent PLUGIN_DEPENDS= munin-node PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/sysutils/munin-node/src/opnsense/service/conf/actions.d/actions_muninnode.conf b/sysutils/munin-node/src/opnsense/service/conf/actions.d/actions_muninnode.conf index 3152e2b0d..693a36398 100644 --- a/sysutils/munin-node/src/opnsense/service/conf/actions.d/actions_muninnode.conf +++ b/sysutils/munin-node/src/opnsense/service/conf/actions.d/actions_muninnode.conf @@ -1,5 +1,5 @@ [start] -command:/usr/local/opnsense/scripts/OPNsense/Muninnode/setup.sh;/usr/local/etc/rc.d/munin-node start +command:/usr/local/etc/rc.d/munin-node start parameters: type:script message:starting munin-node @@ -11,13 +11,13 @@ type:script message:stopping munin-node [restart] -command:/usr/local/opnsense/scripts/OPNsense/Muninnode/setup.sh;/usr/local/etc/rc.d/munin-node restart +command:/usr/local/etc/rc.d/munin-node restart parameters: type:script message:restarting munin-node [status] -command:/usr/local/etc/rc.d/munin-node status;exit 0 +command:/usr/local/etc/rc.d/munin-node status; exit 0 parameters: type:script_output message:request munin-node status diff --git a/sysutils/munin-node/src/opnsense/service/templates/OPNsense/Muninnode/munin_node b/sysutils/munin-node/src/opnsense/service/templates/OPNsense/Muninnode/munin_node index 6c9fc82aa..ac231c1b9 100644 --- a/sysutils/munin-node/src/opnsense/service/templates/OPNsense/Muninnode/munin_node +++ b/sysutils/munin-node/src/opnsense/service/templates/OPNsense/Muninnode/munin_node @@ -1,5 +1,5 @@ {% if helpers.exists('OPNsense.muninnode.general.enabled') and OPNsense.muninnode.general.enabled == '1' %} -munin_node_var_script="/usr/local/opnsense/scripts/OPNsense/Muninnode/setup.sh" +munin_node_setup="/usr/local/opnsense/scripts/OPNsense/Muninnode/setup.sh" munin_node_enable="YES" {% else %} munin_node_enable="NO"