From ed3ae2a61ad25951e43b10960c82549624c43e8b Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Sun, 29 Apr 2012 09:23:42 +0100
Subject: [PATCH] drop a bunch of noops

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 modules/dacs/manifests/init.pp       |  1 -
 modules/vsftpd/manifests/nolisten.pp | 20 --------------------
 modules/vsftpd/manifests/site.pp     | 20 --------------------
 modules/xinetd/manifests/init.pp     |  2 --
 modules/xinetd/manifests/service.pp  | 19 -------------------
 5 files changed, 62 deletions(-)

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 213887a9..bd50ca01 100644
--- a/modules/dacs/manifests/init.pp
+++ b/modules/dacs/manifests/init.pp
@@ -18,7 +18,6 @@ class dacs {
 		owner => root,
 		group => www-data,
 		mode  => '0640',
-		noop  => true,
 	}
 
 	file { '/var/log/dacs':
diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 22951f22..78fcd008 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,32 +1,12 @@
 class vsftpd::nolisten inherits vsftpd {
 
-	$noop = $::hostname ? {
-		bizet     => false,
-		franck    => false,
-		gluck     => false,
-		lobos     => false,
-		kassia    => false,
-		klecker   => false,
-		ravel     => false,
-		saens     => false,
-		santoro   => false,
-		schein    => false,
-		steffani  => false,
-		villa     => false,
-		wieck     => false,
-		morricone => false,
-		default   => true
-	}
-
 	Service['vsftpd'] {
 		ensure => stopped,
-		noop   => $noop,
 	}
 
 	Service['vsftpd']->Service['xinetd']
 
 	file { '/etc/vsftpd.conf':
-		noop    => $noop,
 		content => "listen=NO\n",
 		notify  => Service['vsftpd']
 	}
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index a2ca6cb2..d0129e1d 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -19,34 +19,14 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
-	$noop = $::hostname ? {
-		bizet     => false,
-		franck    => false,
-		gluck     => false,
-		lobos     => false,
-		kassia    => false,
-		klecker   => false,
-		ravel     => false,
-		saens     => false,
-		santoro   => false,
-		schein    => false,
-		steffani  => false,
-		villa     => false,
-		wieck     => false,
-		morricone => false,
-		default   => true
-	}
-
 	if $source {
 		file { $fname:
 			ensure => $ensure,
-			noop   => $noop,
 			source => $source,
 		}
 	} elsif $content {
 		file { $fname:
 			ensure  => $ensure,
-			noop    => $noop,
 			content => $content,
 		}
 	} else {
diff --git a/modules/xinetd/manifests/init.pp b/modules/xinetd/manifests/init.pp
index 79e23590..d85ab700 100644
--- a/modules/xinetd/manifests/init.pp
+++ b/modules/xinetd/manifests/init.pp
@@ -1,14 +1,12 @@
 class xinetd {
 	package { 'xinetd':
 		ensure => installed,
-		noop   => true,
 	}
 
 	service { 'xinetd':
 		ensure    => running,
 		hasstatus => false,
 		pattern   => '/usr/sbin/xinetd',
-		noop      => true,
 		require   => Package['xinetd']
 	}
 }
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index f7c966af..d8121800 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -18,24 +18,6 @@ define xinetd::service (
 ) {
 	include xinetd
 
-	$noop = $::hostname ? {
-		bizet     => false,
-		franck    => false,
-		gluck     => false,
-		lobos     => false,
-		kassia    => false,
-		klecker   => false,
-		ravel     => false,
-		saens     => false,
-		santoro   => false,
-		schein    => false,
-		steffani  => false,
-		villa     => false,
-		wieck     => false,
-		morricone => false,
-		default   => true
-	}
-
 	case $ensure {
 		present,absent,file: {}
 		default: { fail("Invalid ensure for '$name'") }
@@ -50,7 +32,6 @@ define xinetd::service (
 
 	file { "/etc/xinetd.d/${name}":
 		ensure  => $ensure,
-		noop    => $noop,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],
-- 
2.39.2