From 371b6e46931707423c4c213cace6a3a16535cfe6 Mon Sep 17 00:00:00 2001 From: Frank Brendel Date: Mon, 6 Mar 2017 11:53:59 +0100 Subject: [PATCH] Monit template should always create config even with disabled service --- .../controllers/OPNsense/Monit/Api/SettingsController.php | 6 +++++- .../src/opnsense/service/templates/OPNsense/Monit/monitrc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php index 735861554..b45d6f395 100644 --- a/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php +++ b/sysutils/monit/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php @@ -355,7 +355,11 @@ class SettingsController extends ApiControllerBase if ($valMsgs->count() == 0) { $mdlMonit->serializeToConfig(); Config::getInstance()->save(); - $result["result"] = "saved"; + $svcMonit = new ServiceController(); + $result = $svcMonit->configtestAction(); + if ($nodeType == 'general' && $node->enabled->__toString() == 0) { + $result['stop'] = $svcMonit->stopAction(); + } } } } diff --git a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc index 099ad4c8e..e6ee60bd3 100644 --- a/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc +++ b/sysutils/monit/src/opnsense/service/templates/OPNsense/Monit/monitrc @@ -1,7 +1,7 @@ # DO NOT EDIT THIS FILE -- OPNsense auto-generated file {% from 'OPNsense/Macros/interface.macro' import physical_interface %} -{% if helpers.exists('OPNsense.monit.general.enabled') and OPNsense.monit.general.enabled|default("0") == "1" %} +{% if helpers.exists('OPNsense.monit.general') %} set httpd unixsocket /var/run/monit.sock allow localhost