Turn off ftp:// on ftp.debian.org

[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 5846d14..39e40d7 100644 (file)
--- a/modules/roles/manifests/ftp_upload.pp
+++ b/modules/roles/manifests/ftp_upload.pp
@@ -1,28 +1,9 @@
 class roles::ftp_upload {
-
-       $bind = $::hostname ? {
-               kassia  => '::ffff:130.89.149.224',
-               default => '',
-       }
-
-       $bind6 = $::hostname ? {
-               kassia  => '2001:610:1908:a000:21b:78ff:fe75:3d46',
-               default => '',
-       }
-
-       $logfile = '/var/log/ftp/vsftpd-ftp.upload.debian.org.log'
-
        vsftpd::site { 'ftp-upload':
-               content => template('roles/ftp_upload/vsftpd.conf.erb'),
-               logfile => $logfile,
-               bind    => $bind,
-       }
-
-       if $bind6 {
-               vsftpd::site { 'ftp-upload-v6':
-                       content => template('roles/ftp_upload/vsftpd.conf.erb'),
-                       logfile => $logfile,
-                       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',
        }
 }