From: Stephen Gran <steve@lobefin.net>
Date: Tue, 24 Apr 2012 20:04:18 +0000 (+0100)
Subject: and noop it all
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=14939bab78c7c6231e7b13a5b0e655e934b456f0;p=mirror%2Fdsa-puppet.git

and noop it all

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 38e6d8cce..c2e5d079a 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,10 +1,12 @@
 class vsftpd::nolisten {
 
 	Service['vsftpd'] {
-		ensure => stopped
+		ensure => stopped,
+		noop   => true,
 	}
 
 	file { '/etc/vsftpd.conf':
+		noop    => true,
 		content => 'listen=NO'
 		notify  => Service['vsftpd']
 	}
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 565dcdb24..04dcb2010 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -22,11 +22,13 @@ class vsftpd::site (
 	if $source {
 		file { $fname:
 			ensure => $ensure,
+			noop   => true,
 			source => $source,
 		}
 	} elsif $content {
 		file { $fname:
 			ensure  => $ensure,
+			noop    => true,
 			content => $content,
 		}
 	} else {
diff --git a/modules/xinetd/manifests/init.pp b/modules/xinetd/manifests/init.pp
index e2178bd99..521cd4bfd 100644
--- a/modules/xinetd/manifests/init.pp
+++ b/modules/xinetd/manifests/init.pp
@@ -1,9 +1,11 @@
 class xinetd {
 	package { 'xinetd':
-		ensure => installed
+		ensure => installed,
+		noop   => true,
 	}
 
 	service { 'xinetd':
-		ensure => running
+		ensure => running,
+		noop   => true,
 	}
 }
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 2ad6338b0..3dbc8cb07 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -32,6 +32,7 @@ define xinetd::service (
 
 	file { "/etc/xinetd.d/${name}.conf":
 		ensure  => $ensure,
+		noop    => true,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],