diff options
| author | varac <varacanero@zeromail.org> | 2014-02-17 12:57:05 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-02-17 12:57:05 +0100 |
| commit | bd7a0f98ce0819fcc06ad8dcf11600a78577750d (patch) | |
| tree | e96f974f962231dc1388260afb3435e5ce99a114 /puppet/modules/site_nagios/files | |
| parent | 20de385ac787a8a66259bb6fb93a706cbc24d461 (diff) | |
| parent | d0eea33d88a6ffcbe01544678372d80e8c8de51f (diff) | |
Merge branch '4982_check_mk' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios/files')
| -rw-r--r-- | puppet/modules/site_nagios/files/configs/Debian/nagios.cfg | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg index 753d1610..61d9f2da 100644 --- a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg +++ b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg @@ -25,6 +25,9 @@ log_file=/var/log/nagios3/nagios.log # Puppet-managed configuration files cfg_dir=/etc/nagios3/conf.d +# check-mk managed configuration files +cfg_dir=/etc/nagios3/local + # Debian also defaults to using the check commands defined by the debian # nagios-plugins package cfg_dir=/etc/nagios-plugins/config |