Add ftp on ports-master for incoming

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
index 62746ad..3639076 100644 (file)
--- a/modules/roles/manifests/ports-master.pp
+++ b/modules/roles/manifests/ports-master.pp
@@ -18,4 +18,26 @@ class roles::ports-master {
                group => 'mirroradm',
                mode => 0660,
        }
+
+       include ferm::ftp_conntrack
+
+       vsftpd::site { 'ports-master':
+               banner         => 'ports-master.debian.org FTP server',
+               logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+               writable       => true,
+               writable_other => true,
+               chown_user     => mini-dak-unpriv,
+               root           => '/srv/ports-master.debian.org/ftp/incoming',
+       }
+
+       if $bind6 {
+               vsftpd::site { 'ports-master-v6':
+                       banner         => 'ports-master.debian.org FTP server',
+                       logfile        => '/var/log/ftp/vsftpd-ports-master.debian.org.log',
+                       writable       => true,
+                       writable_other => true,
+                       chown_user     => mini-dak-unpriv,
+                       root           => '/srv/ports-master.debian.org/ftp/incoming',
+               }
+       }
 }

diff --git a/modules/vsftpd/manifests/site.pp b/modules/vsftpd/manifests/site.pp
index 63f9ed6..4adb08a 100644 (file)
--- a/modules/vsftpd/manifests/site.pp
+++ b/modules/vsftpd/manifests/site.pp
@@ -3,6 +3,7 @@ define vsftpd::site (
        $bind='',
        $chown_user='',
        $writable=false,
+       $writable_other=false,
        $banner="${name} FTP Server",
        $max_clients=100,
        $logfile="/var/log/ftp/vsftpd-${name}.debian.org.log",

diff --git a/modules/vsftpd/templates/vsftpd.conf.erb b/modules/vsftpd/templates/vsftpd.conf.erb
index 308ae63..5a09a5d 100644 (file)
--- a/modules/vsftpd/templates/vsftpd.conf.erb
+++ b/modules/vsftpd/templates/vsftpd.conf.erb
@@ -12,6 +12,10 @@ anon_upload_enable=YES
 chown_uploads=NO
 chown_username=<%= scope.lookupvar('chown_user') %>
 <%- end -%>
+<%- if scope.lookupvar('writable') and scope.lookupvar('writable_other') -%>
+anon_other_write_enable=YES
+delete_failed_uploads=YES
+<%- end -%>
 
 xferlog_enable=YES
 xferlog_file=<%= scope.lookupvar('logfile') %>