refactor module

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

diff --git a/modules/roles/manifests/ftp_upload.pp b/modules/roles/manifests/ftp_upload.pp
index 3bccb3dbfd4ba050811908d321fcf27ea3301a27..56126068c0289b3cc55e6e5483b1a779591c5c97 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,5 +1,22 @@
 class roles::ftp_upload {
+
+       include ferm::ftp_conntrack
+
        vsftpd::site { 'ftp-upload':
-               source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf'
+               banner     => 'ftp.upload.debian.org FTP server',
+               logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+               writable   => true,
+               chown_user => dak-unpriv,
+               root       => '/srv/upload.debian.org/ftp',
+       }
+
+       if $bind6 {
+               vsftpd::site { 'ftp-upload-v6':
+                       banner     => 'ftp.upload.debian.org FTP server',
+                       logfile    => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+                       writable   => true,
+                       chown_user => dak-unpriv,
+                       root       => '/srv/upload.debian.org/ftp',
+               }
        }
 }