logrotate was overcomplicated

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index efacf705d4dcb2a7f53baa6a17b6839c2dc347ab..077cb43103979bb4330f8c129bb136497eec0620 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,15 +1,15 @@
-class vsftpd::site (
-       $source='',
-       $content='',
-       $bind=$::ipaddress,
+define vsftpd::site (
+       $root,
+       $bind='',
+       $chown_user='',
+       $writable=false,
+       $banner="${name} FTP Server",
+       $max_clients=100,
+       $logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",
        $ensure=present
 ){
 
-       include vsftpd::nolisten
-
-       if ($source and $content) {
-               fail ( "Can't have both source and content for $name" )
-       }
+       include vsftpd
 
        case $ensure {
                present,absent: {}
@@ -18,30 +18,26 @@ class vsftpd::site (
 
        $fname = "/etc/vsftpd-${name}.conf"
 
-       if $source {
-               file { $fname:
-                       ensure => $ensure,
-                       noop   => true,
-                       source => $source,
-               }
-       } elsif $content {
-               file { $fname:
-                       ensure  => $ensure,
-                       noop    => true,
-                       content => $content,
-               }
-       } else {
-               fail ( "Need one of source or content for $name" )
+       file { $fname:
+               ensure  => $ensure,
+               content => template('vsftpd/vsftpd.conf.erb')
+       }
+
+       file { "/etc/logrotate.d/vsftpd-${name}":
+               ensure => absent
        }
 
        # 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   => $max_clients,
+               require     => File[$fname]
        }
 
+       Service['vsftpd']->Service['xinetd']
 }