now do lobos

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 7001455c851e91256090ae764e0c8ff27f5b7a72..2087839a897bdf833592fdfe3e634d572854ae56 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -20,6 +20,7 @@ define vsftpd::site (
 
        $noop = $::hostname ? {
                villa   => false,
+               lobos   => false,
                default => true
        }
 
@@ -42,7 +43,7 @@ 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,