quiet you

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

diff --git a/modules/samhain/manifests/init.pp b/modules/samhain/manifests/init.pp
index c94e0cce2e12ffaf7d7a261a68bfa7ca44985e53..c373ed04ec01e8a9486b5605abf7e71466f7c5d3 100644 (file)
--- a/modules/samhain/manifests/init.pp
+++ b/modules/samhain/manifests/init.pp
@@ -1,17 +1,18 @@
 class samhain {
 
-    package { samhain: ensure => latest }
+       package { 'samhain':
+               ensure => installed
+       }
 
-    file { "/etc/samhain/samhainrc":
-        source  => [ "puppet:///samhain/per-host/$fqdn/samhainrc",
-                     "puppet:///samhain/common/samhainrc" ],
-        require => Package["samhain"],
-        notify  => Exec["samhain reload"],
-    }
+       service { 'samhain':
+               ensure => running
+               hasstatus => false,
+               pattern   => 'samhain',
+       }
 
-    exec { "samhain reload":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
+       file { '/etc/samhain/samhainrc':
+               content => template('samhain/samhainrc.erb'),
+               require => Package['samhain'],
+               notify  => Service['samhain']
+       }
 }
-