From: Stephen Gran <steve@lobefin.net>
Date: Sat, 28 Apr 2012 10:49:50 +0000 (+0100)
Subject: roll out to morricone
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=45e86ea20c646cf8c4589cddfb0e56eb3f954d0d

roll out to morricone

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index a95f80f2..4a552726 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,15 +1,16 @@
 class vsftpd::nolisten inherits vsftpd {
 
 	$noop = $::hostname ? {
-		gluck    => false,
-		lobos    => false,
-		saens    => false,
-		santoro  => false,
-		schein   => false,
-		steffani => false,
-		villa    => false,
-		wieck    => false,
-		default  => true
+		gluck     => false,
+		lobos     => false,
+		saens     => false,
+		santoro   => false,
+		schein    => false,
+		steffani  => false,
+		villa     => false,
+		wieck     => false,
+		morricone => false,
+		default   => true
 	}
 
 	Service['vsftpd'] {
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 5d5a2ecf..d89d7a2f 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -19,15 +19,16 @@ define vsftpd::site (
 	$fname = "/etc/vsftpd-${name}.conf"
 
 	$noop = $::hostname ? {
-		gluck    => false,
-		lobos    => false,
-		saens    => false,
-		santoro  => false,
-		schein   => false,
-		steffani => false,
-		villa    => false,
-		wieck    => false,
-		default  => true
+		gluck     => false,
+		lobos     => false,
+		saens     => false,
+		santoro   => false,
+		schein    => false,
+		steffani  => false,
+		villa     => false,
+		wieck     => false,
+		morricone => false,
+		default   => true
 	}
 
 	if $source {
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index ff15c360..3e594e50 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,15 +19,16 @@ define xinetd::service (
 	include xinetd
 
 	$noop = $::hostname ? {
-		gluck    => false,
-		lobos    => false,
-		saens    => false,
-		santoro  => false,
-		schein   => false,
-		steffani => false,
-		villa    => false,
-		wieck    => false,
-		default  => true
+		gluck     => false,
+		lobos     => false,
+		saens     => false,
+		santoro   => false,
+		schein    => false,
+		steffani  => false,
+		villa     => false,
+		wieck     => false,
+		morricone => false,
+		default   => true
 	}
 
 	case $ensure {