Merge remote-tracking branch 'waldi/vsftpd-systemd-upload'

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

diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 441c723..5823032 100644 (file)
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -1,4 +1,7 @@
 class roles::ftp {
+       # this is the FTP part of the roles::debian_mirror class
+
+       include ferm::ftp_conntrack
 
        $bind = $::hostname ? {
                klecker => '::ffff:130.89.148.12',
@@ -11,14 +14,20 @@ class roles::ftp {
        }
 
        vsftpd::site { 'ftp':
-               source => 'puppet:///modules/roles/ftp/vsftpd.conf',
-               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 {
+       if $bind6 != '' {
                vsftpd::site { 'ftp-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',
+                       bind         => $bind6,
+                       max_clients  => 200,
+                       root         => '/srv/ftp.debian.org/ftp.root',
                }
        }
 }