Merge pull request #2430 from b6d/nagios-module-icingacfg

nagios module: add common locactions of icinga.cfg
12 years ago · bf4646738f
parent 538b0314a7 14bf549b13
commit bf4646738f
1 changed files with 5 additions and 1 deletions
--- a/6
+++ b/6
@ -128,7 +128,11 @@ def which_cmdfile():
        '/usr/local/nagios/etc/nagios.cfg',
        '/usr/local/nagios/nagios.cfg',
        '/opt/nagios/etc/nagios.cfg',
-        '/opt/nagios/nagios.cfg'
+        '/opt/nagios/nagios.cfg',
+        # icinga on debian/ubuntu
+        '/etc/icinga/icinga.cfg',
+        # icinga installed from source (default location)
+        '/usr/local/icinga/etc/icinga.cfg',
        ]

    for path in locations: