snapshot - drop traffic from 61.69.254.110

[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 d714d7c..1f5911f 100644 (file)
--- a/modules/roles/manifests/ports_master.pp
+++ b/modules/roles/manifests/ports_master.pp
@@ -1,7 +1,8 @@
 class roles::ports_master {
-       rsync::site_systemd { 'ports-master':
+       rsync::site { 'ports-master':
                source      => 'puppet:///modules/roles/ports_master/rsyncd.conf',
-               max_clients => 100,
+               # Needs to be at least number of direct mirrors plus some spare
+               max_clients => 50,
                sslname     => 'ports-master.debian.org',
        }
 
@@ -9,8 +10,6 @@ class roles::ports_master {
                key => true,
        }
 
-       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',
@@ -19,15 +18,4 @@ class roles::ports_master {
                chown_user     => mini-dak-unpriv,
                root           => '/srv/ports-master.debian.org/ftp.upload',
        }
-
-       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',
-               }
-       }
 }