summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-01-31 04:32:13 -0800
committerelijah <elijah@riseup.net>2013-01-31 04:32:13 -0800
commitefed0453a754ca1c1725192546c10ccc4fb3ebe1 (patch)
tree6b2b568fd39f72d814ddee1a115e7fdf3d7c143a /puppet/modules/site_nagios/manifests
parent3c3ed940466eabf9cb56a47614133b5bc90d4ad7 (diff)
parent5d54af627590acd9606e570fbb1ccb87e1237a76 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules/site_nagios/manifests')
-rw-r--r--puppet/modules/site_nagios/manifests/init.pp4
-rw-r--r--puppet/modules/site_nagios/manifests/server/purge.pp2
2 files changed, 5 insertions, 1 deletions
diff --git a/puppet/modules/site_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp
new file mode 100644
index 00000000..57da3011
--- /dev/null
+++ b/puppet/modules/site_nagios/manifests/init.pp
@@ -0,0 +1,4 @@
+class site_nagios {
+ tag 'service'
+ include site_nagios::server
+}
diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp
index 66c27dd5..39735cd3 100644
--- a/puppet/modules/site_nagios/manifests/server/purge.pp
+++ b/puppet/modules/site_nagios/manifests/server/purge.pp
@@ -1,6 +1,6 @@
class site_nagios::server::purge {
exec {'purge_conf.d':
- command => '/bin/rm -rf /etc/nagios3/conf.d',
+ command => '/bin/rm -rf /etc/nagios3/conf.d/*',
onlyif => 'test -e /etc/nagios3/conf.d'
}