Do not mask vsftpd.service in each site

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

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 9df1fade7ad9d5e25c0559fcdec5033a412ed4a7..f8a71a0fb52d9aa297949593bf0df5af0efb635a 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -1,54 +1,39 @@
 define vsftpd::site (
-       $source='',
-       $content='',
+       $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: {}
                default: { fail ( "Invald ensure `$ensure' for $name" ) }
        }
 
+       $ftpsite = $name
+
        $fname = "/etc/vsftpd-${name}.conf"
 
-       $noop = $::hostname ? {
-               bizet     => false,
-               franck    => false,
-               gluck     => false,
-               lobos     => false,
-               klecker   => false,
-               ravel     => false,
-               saens     => false,
-               santoro   => false,
-               schein    => false,
-               steffani  => false,
-               villa     => false,
-               wieck     => false,
-               morricone => false,
-               default   => true
+       file { $fname:
+               ensure  => $ensure,
+               content => template('vsftpd/vsftpd.conf.erb')
        }
 
-       if $source {
-               file { $fname:
-                       ensure => $ensure,
-                       noop   => $noop,
-                       source => $source,
-               }
-       } elsif $content {
-               file { $fname:
-                       ensure  => $ensure,
-                       noop    => $noop,
-                       content => $content,
-               }
-       } else {
-               fail ( "Need one of source or content for $name" )
+       file { "/etc/logrotate.d/vsftpd-${name}":
+               ensure => absent
+       }
+
+       munin::check { "vsftpd-${name}":
+               script => 'vsftpd'
+       }
+       munin::conf { "vsftpd-${name}":
+               content => template('vsftpd/munin.erb')
        }
 
        # We don't need a firewall rule because it's added in vsftp.pp
@@ -59,8 +44,9 @@ define vsftpd::site (
                port        => 'ftp',
                server_args => $fname,
                ferm        => false,
-               instances   => 200,
+               instances   => $max_clients,
                require     => File[$fname]
        }
 
+       Service['vsftpd']->Service['xinetd']
 }