Merge remote-tracking branch 'waldi/managed-rsyncd-ports-master'

[mirror/dsa-puppet.git] / modules / roles / manifests / ports-master.pp

diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
index 62746ad..9efae95 100644 (file)
--- a/modules/roles/manifests/ports-master.pp
+++ b/modules/roles/manifests/ports-master.pp
@@ -9,13 +9,25 @@ class roles::ports-master {
                key => true,
        }
 
-       file { '/etc/rsyncd':
-               ensure => 'directory'
+       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.upload',
        }
 
-       file { '/etc/rsyncd/debian.secrets':
-               owner => 'root',
-               group => 'mirroradm',
-               mode => 0660,
+       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.upload',
+               }
        }
 }