roll out to saens

[dsa-puppet.git] / modules / vsftpd / manifests / site.pp

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 26541cc01aeda0c8ebd1e9b46bffcbfcff3ffa90..5f94751d09c4f8d53ab6bc54cca46344c11c43a9 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,8 +1,7 @@
 define vsftpd::site (
-       $name,
        $source='',
        $content='',
-       $bind=$::ipaddress,
+       $bind='',
        $ensure=present
 ){
 
@@ -19,16 +18,26 @@ define vsftpd::site (
 
        $fname = "/etc/vsftpd-${name}.conf"
 
+       $noop = $::hostname ? {
+               villa    => false,
+               lobos    => false,
+               saens    => false,
+               schein   => false,
+               steffani => false,
+               wieck    => 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 {
@@ -38,11 +47,12 @@ define vsftpd::site (
        # We don't need a firewall rule because it's added in vsftp.pp
        xinetd::service { "vsftpd-${name}":
                bind        => $bind,
-               id          => $name,
+               id          => "${name}-ftp",
                server      => '/usr/sbin/vsftpd',
                port        => 'ftp',
                server_args => $fname,
                ferm        => false,
+               require     => File[$fname]
        }
 
 }