Generate the apache ACL for draghi's "restricted" repo (RT#7962)

[mirror/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 807332f..75bd568 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,26 +1,9 @@
 class roles::ftp_upload {
-
-       $bind = $::hostname ? {
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               default => '',
-       }
-
-       $logfile = '/var/log/ftp/vsftpd-ftp.upload.debian.org.log'
-
-       vsftpd::site { 'ftp-upload':
-               source  => template('roles/ftp_upload/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
-       }
-
-       if $bind6 {
-               vsftpd::site { 'ftp-upload-v6':
-                       source  => template('roles/ftp_upload/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       bind    => $bind6,
-               }
-       }
+  vsftpd::site { 'ftp-upload':
+    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',
+  }
 }