23 lines
1.0 KiB
Diff
23 lines
1.0 KiB
Diff
|
--- a/modules/check_mk.py 2014-07-04 09:24:22.000000000 +0200
|
||
|
+++ b/modules/check_mk.py 2014-07-09 23:07:27.077488020 +0200
|
||
|
@@ -110,6 +110,7 @@
|
||
|
check_result_path = '/usr/local/nagios/var/spool/checkresults'
|
||
|
www_group = None # unset
|
||
|
nagios_startscript = '/etc/init.d/nagios'
|
||
|
+nagios_startuptype = 'script'
|
||
|
nagios_binary = '/usr/sbin/nagios'
|
||
|
nagios_config_file = '/etc/nagios/nagios.cfg'
|
||
|
logwatch_notes_url = "/nagios/logwatch.php?host=%s&file=%s"
|
||
|
@@ -4710,7 +4711,10 @@
|
||
|
sys.stdout.flush()
|
||
|
if monitoring_core == "nagios":
|
||
|
os.putenv("CORE_NOVERIFY", "yes")
|
||
|
- command = nagios_startscript + " re%s 2>&1" % action
|
||
|
+ if nagios_startuptype == 'script':
|
||
|
+ command = nagios_startscript + " re%s 2>&1" % action
|
||
|
+ else:
|
||
|
+ command = nagios_startuptype + " re%s " % action + nagios_service
|
||
|
else:
|
||
|
command = "omd re%s cmc 2>&1" % action
|
||
|
|