drop a bunch of noops

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

diff --git a/modules/dacs/manifests/init.pp b/modules/dacs/manifests/init.pp
index 213887a..bd50ca0 100644 (file)
--- 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 22951f2..78fcd00 100644 (file)
--- 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 a2ca6cb..d0129e1 100644 (file)
--- 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 79e2359..d85ab70 100644 (file)
--- 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 f7c966a..d812180 100644 (file)
--- 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'],