diff options
author | varac <varacanero@zeromail.org> | 2016-03-09 17:40:11 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-03-09 17:40:11 +0100 |
commit | bcd6bbeceee3fd4ad2082f46352d9f0813afa9ef (patch) | |
tree | 453b34cd26ccf7e56e002d19a39616d481e73bf8 /puppet/modules/site_nagios/manifests/server | |
parent | 0810e24d7b063c613a482fa04f43be89c6b38fb9 (diff) | |
parent | ee4fc33396aa52f9ec797fd431b3027d88fa1aa7 (diff) |
Merge branch '2327_dont_recreate_nagios_resources' into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests/server')
-rw-r--r-- | puppet/modules/site_nagios/manifests/server/hostgroup.pp | 5 | ||||
-rw-r--r-- | puppet/modules/site_nagios/manifests/server/purge.pp | 19 |
2 files changed, 4 insertions, 20 deletions
diff --git a/puppet/modules/site_nagios/manifests/server/hostgroup.pp b/puppet/modules/site_nagios/manifests/server/hostgroup.pp index 6f85ca6d..25623924 100644 --- a/puppet/modules/site_nagios/manifests/server/hostgroup.pp +++ b/puppet/modules/site_nagios/manifests/server/hostgroup.pp @@ -1,3 +1,6 @@ +# create a nagios hostsgroup define site_nagios::server::hostgroup ($contact_emails) { - nagios_hostgroup { $name: } + nagios_hostgroup { $name: + ensure => present + } } diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp deleted file mode 100644 index 6815a703..00000000 --- a/puppet/modules/site_nagios/manifests/server/purge.pp +++ /dev/null @@ -1,19 +0,0 @@ -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 files 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"', - require => Package['nagios'] - } -} |