Merge remote-tracking branch 'waldi/log_apache2'

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

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 294cea3..452c459 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,22 +1,16 @@
 class roles::ftp {
+       # this is the FTP part of the roles::debian_mirror class
 
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
+       $binds = $::hostname ? {
+               klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]' ],
+               default => [ '[::]' ],
        }
 
        vsftpd::site { 'ftp':
-               source => 'puppet:///modules/roles/ftp/vsftpd.conf',
-               bind   => $bind,
-       }
-
-       if $bind6 {
-               vsftpd::site { 'security-v6':
-                       source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       bind   => $bind6,
-               }
+               banner       => 'ftp.debian.org FTP server',
+               logfile      => '/var/log/ftp/vsftpd-ftp.debian.org.log',
+               binds        => $binds,
+               max_clients  => 200,
+               root         => '/srv/ftp.debian.org/ftp.root',
        }
 }