Use unique names for pg_hba.conf entries

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