Remove duplicate for /etc/puppet

[mirror/dsa-puppet.git] / modules / samhain / manifests / init.pp

diff --git a/modules/samhain/manifests/init.pp b/modules/samhain/manifests/init.pp
index 5a56fbe..c4a466e 100644 (file)
--- a/modules/samhain/manifests/init.pp
+++ b/modules/samhain/manifests/init.pp
@@ -1,18 +1,16 @@
 class samhain {
 
-    package { samhain: ensure => latest }
+    package { samhain: ensure => installed }
 
     file { "/etc/samhain/samhainrc":
-        owner   => root,
-        group   => root,
-        mode    => 444,
-        source  => "puppet:///samhain/samhainrc",
+        source  => [ "puppet:///samhain/per-host/$fqdn/samhainrc",
+                     "puppet:///samhain/common/samhainrc" ],
         require => Package["samhain"],
         notify  => Exec["samhain reload"],
     }
 
     exec { "samhain reload":
-        path        => "/etc/init.d/",
+        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
         refreshonly => true,
     }
 }