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/manifests/server | |
parent | 20de385ac787a8a66259bb6fb93a706cbc24d461 (diff) | |
parent | d0eea33d88a6ffcbe01544678372d80e8c8de51f (diff) |
Merge branch '4982_check_mk' into 0.6
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server')
-rw-r--r-- | puppet/modules/site_nagios/manifests/server/apache.pp | 7 | ||||
-rw-r--r-- | puppet/modules/site_nagios/manifests/server/purge.pp | 19 |
2 files changed, 22 insertions, 4 deletions
diff --git a/puppet/modules/site_nagios/manifests/server/apache.pp b/puppet/modules/site_nagios/manifests/server/apache.pp new file mode 100644 index 00000000..8dbc7e9b --- /dev/null +++ b/puppet/modules/site_nagios/manifests/server/apache.pp @@ -0,0 +1,7 @@ +class site_nagios::server::apache { + include x509::variables + include site_config::x509::commercial::cert + include site_config::x509::commercial::key + include site_config::x509::commercial::ca + +} diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp index 39735cd3..1c12cfb0 100644 --- a/puppet/modules/site_nagios/manifests/server/purge.pp +++ b/puppet/modules/site_nagios/manifests/server/purge.pp @@ -1,7 +1,18 @@ -class site_nagios::server::purge { - exec {'purge_conf.d': - command => '/bin/rm -rf /etc/nagios3/conf.d/*', - onlyif => 'test -e /etc/nagios3/conf.d' +class site_nagios::server::purge inherits nagios::base { + # we don't want to get /etc/nagios3 and /etc/nagios3/conf.d + # purged, cause the check-mk-config-nagios3 package + # places its templates in /etc/nagios3/conf.d/check_mk, + # and check_mk -O updated it's nagios config in /etc/nagios3/conf.d/check_mk + File['nagios_cfgdir'] { + purge => false + } + File['nagios_confd'] { + purge => false } + # only purge find in the /etc/nagios3/conf.d/ dir, not in any subdir + exec {'purge_conf.d': + command => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f -exec rm {} \;', + onlyif => '/usr/bin/find /etc/nagios3/conf.d/ -maxdepth 1 -type f | grep -q "/etc/nagios3/conf.d"' + } } |