From 73ea236001acadd857038635cbed739264ee05ea Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 25 Jul 2017 06:30:12 +0200 Subject: [PATCH] net-mgmt/collectd: merge setup.sh cleanup from master --- net-mgmt/collectd/Makefile | 1 + .../app/controllers/OPNsense/Collectd/Api/ServiceController.php | 2 +- .../collectd/src/opnsense/scripts/OPNsense/Collectd/setup.sh | 0 3 files changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 net-mgmt/collectd/src/opnsense/scripts/OPNsense/Collectd/setup.sh diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile index 132466328..8b8b78ffb 100644 --- a/net-mgmt/collectd/Makefile +++ b/net-mgmt/collectd/Makefile @@ -1,5 +1,6 @@ PLUGIN_NAME= collectd PLUGIN_VERSION= 0.2 +PLUGIN_REVISION= 2 PLUGIN_COMMENT= Collect system and application performance metrics periodically PLUGIN_DEPENDS= collectd5 PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php index 14538d355..6ae1bb15c 100644 --- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php +++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/Api/ServiceController.php @@ -133,7 +133,7 @@ class ServiceController extends ApiControllerBase $this->stopAction(); // generate template - $backend->configdRun('template reload OPNsense/collectd'); + $backend->configdRun('template reload OPNsense/Collectd'); // (res)start daemon if ($mdlGeneral->enabled->__toString() == 1) { diff --git a/net-mgmt/collectd/src/opnsense/scripts/OPNsense/Collectd/setup.sh b/net-mgmt/collectd/src/opnsense/scripts/OPNsense/Collectd/setup.sh old mode 100644 new mode 100755