From: Stephen Gran <steve@lobefin.net>
Date: Tue, 17 Apr 2012 19:13:47 +0000 (+0100)
Subject: noop is gone and manifest tidy
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=76db7277cf690c7dec858f9782cf049c5b223f34;p=mirror%2Fdsa-puppet.git

noop is gone and manifest tidy

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/manifests/init.pp b/modules/samhain/manifests/init.pp
index f659fb801..09e649b07 100644
--- a/modules/samhain/manifests/init.pp
+++ b/modules/samhain/manifests/init.pp
@@ -10,13 +10,13 @@ class samhain {
 
 	package { 'samhain':
 		ensure => installed,
-		noop   => true,
 	}
 
 	service { 'samhain':
-		ensure => running,
+		ensure    => running,
 		hasstatus => false,
 		pattern   => 'samhain',
+		require   => Package['samhain'],
 	}
 
 	file { '/etc/samhain/samhainrc':