start rolling out

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index bc66c95d277b086e79db15dbea3deaf33a0387e1..7001455c851e91256090ae764e0c8ff27f5b7a72 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,10 +1,11 @@
-class vsftpd::site (
+define vsftpd::site (
        $source='',
        $content='',
-       $ensure=present,
+       $bind='',
+       $ensure=present
 ){
 
-       include vsftpd
+       include vsftpd::nolisten
 
        if ($source and $content) {
                fail ( "Can't have both source and content for $name" )
@@ -15,20 +16,37 @@ class vsftpd::site (
                default: { fail ( "Invald ensure `$ensure' for $name" ) }
        }
 
+       $fname = "/etc/vsftpd-${name}.conf"
+
+       $noop = $::hostname ? {
+               villa   => false,
+               default => true
+       }
+
        if $source {
-               file { '/etc/vsftpd.conf':
+               file { $fname:
                        ensure => $ensure,
+                       noop   => $noop,
                        source => $source,
-                       notify => Service['vsftpd']
                }
        } elsif $content {
-               file { '/etc/vsftpd.conf':
+               file { $fname:
                        ensure  => $ensure,
+                       noop    => $noop,
                        content => $content,
-                       notify  => Service['vsftpd']
                }
        } else {
                fail ( "Need one of source or content for $name" )
        }
 
+       # We don't need a firewall rule because it's added in vsftp.pp
+       xinetd::service { "vsftpd-${name}":
+               bind        => $bind,
+               id          => $name,
+               server      => '/usr/sbin/vsftpd',
+               port        => 'ftp',
+               server_args => $fname,
+               ferm        => false,
+       }
+
 }