Merge branch 'develop' of ssh://leap.se/leap_platform into develop

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'
   }