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

nagios module: add common locactions of icinga.cfg
13 years ago · 7be78d503c
parent 3ee53a2760 2e60692082
commit 7be78d503c
1 changed files with 5 additions and 1 deletions
--- a/library/nagios
+++ b/library/nagios
@ -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: