a slightly better name

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 565dcdb249d3950855da350884131191f86095dd..00f0614e5bd016b6da5875d328d16c5405745b68 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,11 +1,10 @@
-class vsftpd::site (
+define vsftpd::site (
        $source='',
        $content='',
-       $bind=$::ipaddress,
+       $bind='',
        $ensure=present
 ){
 
-       include vsftpd
        include vsftpd::nolisten
 
        if ($source and $content) {
@@ -19,14 +18,21 @@ class vsftpd::site (
 
        $fname = "/etc/vsftpd-${name}.conf"
 
+       $noop = $::hostname ? {
+               villa   => false,
+               default => true
+       }
+
        if $source {
                file { $fname:
                        ensure => $ensure,
+                       noop   => $noop,
                        source => $source,
                }
        } elsif $content {
                file { $fname:
                        ensure  => $ensure,
+                       noop    => $noop,
                        content => $content,
                }
        } else {
@@ -36,7 +42,7 @@ class 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,