From 8300f1920b1692b9bb569c4b4b9c359b10960dd3 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 21 Oct 2022 15:02:45 +0200
Subject: [PATCH] net-mgmt/collectd: use NAME_setup

PR: https://github.com/opnsense/core/issues/5917
---
 .../opnsense/service/conf/actions.d/actions_collectd.conf | 8 ++++----
 .../opnsense/service/templates/OPNsense/Collectd/collectd | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf b/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf
index 5e5473ec4..817d6a2d4 100644
--- a/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf
+++ b/net-mgmt/collectd/src/opnsense/service/conf/actions.d/actions_collectd.conf
@@ -1,23 +1,23 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh;/usr/local/etc/rc.d/collectd start
+command:/usr/local/etc/rc.d/collectd start
 parameters:
 type:script
 message:starting Collectd
 
 [stop]
-command:/usr/local/etc/rc.d/collectd stop; exit 0
+command:/usr/local/etc/rc.d/collectd stop
 parameters:
 type:script
 message:stopping Collectd
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh;/usr/local/etc/rc.d/collectd restart
+command:/usr/local/etc/rc.d/collectd restart
 parameters:
 type:script
 message:restarting Collectd
 
 [status]
-command:/usr/local/etc/rc.d/collectd status;exit 0
+command:/usr/local/etc/rc.d/collectd status; exit 0
 parameters:
 type:script_output
 message:request Collectd status
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 cf5949f7d..a9a97d84e 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,5 @@
 {% if helpers.exists('OPNsense.collectd.general.enabled') and OPNsense.collectd.general.enabled == '1' %}
-collectd_var_script="/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh"
+collectd_setup="/usr/local/opnsense/scripts/OPNsense/Collectd/setup.sh"
 collectd_enable="YES"
 {% else %}
 collectd_enable="NO"