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

roll out to gluck

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

diff --git a/modules/vsftpd/manifests/nolisten.pp b/modules/vsftpd/manifests/nolisten.pp
index 88eaea89..a95f80f2 100644
--- a/modules/vsftpd/manifests/nolisten.pp
+++ b/modules/vsftpd/manifests/nolisten.pp
@@ -1,12 +1,13 @@
 class vsftpd::nolisten inherits vsftpd {
 
 	$noop = $::hostname ? {
-		villa    => false,
+		gluck    => false,
 		lobos    => false,
 		saens    => false,
 		santoro  => false,
 		schein   => false,
 		steffani => false,
+		villa    => false,
 		wieck    => false,
 		default  => true
 	}
diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index a73befa2..5d5a2ecf 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -19,12 +19,13 @@ define vsftpd::site (
 	$fname = "/etc/vsftpd-${name}.conf"
 
 	$noop = $::hostname ? {
-		villa    => false,
+		gluck    => false,
 		lobos    => false,
 		saens    => false,
 		santoro  => false,
 		schein   => false,
 		steffani => false,
+		villa    => false,
 		wieck    => false,
 		default  => true
 	}
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index fc6460cc..ff15c360 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -19,12 +19,13 @@ define xinetd::service (
 	include xinetd
 
 	$noop = $::hostname ? {
-		villa    => false,
+		gluck    => false,
 		lobos    => false,
 		saens    => false,
 		santoro  => false,
 		schein   => false,
 		steffani => false,
+		villa    => false,
 		wieck    => false,
 		default  => true
 	}