Give arrays another try

[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 abcc6bbd22082c62d9cea8c7f95ba1becf4d5d2b..56126068c0289b3cc55e6e5483b1a779591c5c97 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,24 +1,22 @@
 class roles::ftp_upload {
 
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
-       }
+       include ferm::ftp_conntrack
 
        vsftpd::site { 'ftp-upload':
-               source  => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
-               logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-               bind    => $bind,
+               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':
-                       source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-                       logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
-                       bind    => $bind6,
+                       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',
                }
        }
 }