diff options
| author | elijah <elijah@riseup.net> | 2015-10-14 12:45:09 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-10-14 12:45:09 -0700 |
| commit | 81763f22e0e5515fa2a3b9c8a65050692bb1cf74 (patch) | |
| tree | 42a86bbb40d4a7b8b84c37bae4f0aa3362a3c475 /puppet/modules/site_nagios | |
| parent | 33b9876af4af85504107aae20feb57aaab5a17ad (diff) | |
| parent | 43595b105a21aaccb41c4d9199d87b3dc2d48ab5 (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_nagios')
| -rw-r--r-- | puppet/modules/site_nagios/files/configs/Debian/nagios.cfg | 2 | ||||
| -rw-r--r-- | puppet/modules/site_nagios/manifests/init.pp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg index 0d729b8c..981dc12a 100644 --- a/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg +++ b/puppet/modules/site_nagios/files/configs/Debian/nagios.cfg @@ -70,7 +70,7 @@ precached_object_file=/var/lib/nagios3/objects.precache # defined as macros in this file and restrictive permissions (600) # can be placed on this file. -resource_file=/etc/nagios3/private/resource.cfg +resource_file=/etc/nagios3/resource.cfg diff --git a/puppet/modules/site_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp index eb08cdcb..40ae4b86 100644 --- a/puppet/modules/site_nagios/manifests/init.pp +++ b/puppet/modules/site_nagios/manifests/init.pp @@ -1,6 +1,10 @@ +# setup nagios on monitoring node class site_nagios { tag 'leap_service' Class['site_config::default'] -> Class['site_nagios'] include site_nagios::server + + # remove leftovers on monitoring nodes + include site_config::remove::monitoring } |