roll out to santoro

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 7001455c851e91256090ae764e0c8ff27f5b7a72..a73befa2738e98bc8674f4c10da120a3a49d6f19 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -19,8 +19,14 @@ define vsftpd::site (
        $fname = "/etc/vsftpd-${name}.conf"
 
        $noop = $::hostname ? {
-               villa   => false,
-               default => true
+               villa    => false,
+               lobos    => false,
+               saens    => false,
+               santoro  => false,
+               schein   => false,
+               steffani => false,
+               wieck    => false,
+               default  => true
        }
 
        if $source {
@@ -42,11 +48,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]
        }
 
 }