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 af3283eda7506bb11ca43edf80b6722fe1c55585..7001455c851e91256090ae764e0c8ff27f5b7a72 100644 (file)
--- 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 389c0ca96154fc8c30cd9083bb3b6d5a4218ded0..5ea4e8d3d84a9d79f55c3242624a5a0d58974d88 100644 (file)
--- 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'],