reorganize vsftp::site

[dsa-puppet.git] / modules / roles / manifests / ftp.pp

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index febecf6ef8f498625952a84608daf3a0b70120d5..0ae4254e569390e21cbb326151ab1380acc56e38 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -12,19 +12,21 @@ class roles::ftp {
                default => '',
        }
 
-       $logfile = '/var/log/ftp/vsftpd-ftp.debian.org.log'
-
        vsftpd::site { 'ftp':
-               content => template('roles/ftp/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
+               banner       => 'ftp.debian.org FTP server',
+               logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+               bind         => $bind,
+               max_clients  => 200,
+               root         => '/srv/ftp.debian.org/ftp.root',
        }
 
        if $bind6 {
                vsftpd::site { 'ftp-v6':
-                       content => template('roles/ftp/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       bind    => $bind6,
+                       banner       => 'ftp.debian.org FTP server',
+                       logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+                       bind         => $bind6,
+                       max_clients  => 200,
+                       root         => '/srv/ftp.debian.org/ftp.root',
                }
        }
 }