From: Stephen Gran <steve@lobefin.net>
Date: Sat, 28 Apr 2012 09:06:55 +0000 (+0100)
Subject: start rolling out
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=f4d6d9b163364d2f3f87efd01040f568fc0afa35

start rolling out

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index af3283ed..7001455c 100644
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -18,16 +18,21 @@ define vsftpd::site (
 
 	$fname = "/etc/vsftpd-${name}.conf"
 
+	$noop = $::hostname ? {
+		villa   => false,
+		default => true
+	}
+
 	if $source {
 		file { $fname:
 			ensure => $ensure,
-			noop   => true,
+			noop   => $noop,
 			source => $source,
 		}
 	} elsif $content {
 		file { $fname:
 			ensure  => $ensure,
-			noop    => true,
+			noop    => $noop,
 			content => $content,
 		}
 	} else {
diff --git a/modules/xinetd/manifests/service.pp b/modules/xinetd/manifests/service.pp
index 389c0ca9..5ea4e8d3 100644
--- a/modules/xinetd/manifests/service.pp
+++ b/modules/xinetd/manifests/service.pp
@@ -18,6 +18,11 @@ define xinetd::service (
 ) {
 	include xinetd
 
+	$noop = $::hostname ? {
+		villa   => false,
+		default => true
+	}
+
 	case $ensure {
 		present,absent,file: {}
 		default: { fail("Invalid ensure for '$name'") }
@@ -32,7 +37,7 @@ define xinetd::service (
 
 	file { "/etc/xinetd.d/${name}":
 		ensure  => $ensure,
-		noop    => true,
+		noop    => $noop,
 		content => template('xinetd/service.erb'),
 		notify  => Service['xinetd'],
 		require => Package['xinetd'],