drop a bunch of noops

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 565dcdb249d3950855da350884131191f86095dd..d0129e1dfc42cd15f0c176a05ac5ea5180c091d7 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,11 +1,11 @@
-class vsftpd::site (
+define vsftpd::site (
        $source='',
        $content='',
-       $bind=$::ipaddress,
+       $bind='',
+       $logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
        $ensure=present
 ){
 
-       include vsftpd
        include vsftpd::nolisten
 
        if ($source and $content) {
@@ -33,14 +33,21 @@ class vsftpd::site (
                fail ( "Need one of source or content for $name" )
        }
 
+       file { "/etc/logrotate.d/vsftpd-${name}":
+               ensure  => $ensure,
+               content => template('vsftpd/logrotate.erb')
+       }
+
        # 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,
+               instances   => 200,
+               require     => File[$fname]
        }
 
 }