port 6081 should be allowed via snapshot

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

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index ae3c471..365f3b0 100644 (file)
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,21 +1,14 @@
 class roles::security_master {
-
        ssl::service { 'security-master.debian.org':
-               notify => Service['apache2'],
-               key => true,
-       }
-
-       vsftpd::site { 'security':
-               banner     => 'security-master.debian.org FTP server (vsftpd)',
-               logfile    => '/var/log/ftp/vsftpd-security-master.debian.org.log',
-               writable   => true,
-               chown_user => dak-unpriv,
-               root       => '/srv/ftp.root/',
+               notify   => Exec['service apache2 reload'],
+               key      => true,
+               tlsaport => [443, 1873],
        }
 
        rsync::site { 'security_master':
-               source        => 'puppet:///modules/roles/security_master/rsyncd.conf',
-               max_clients => 100,
-               sslname => "security-master.debian.org",
+               source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
+               # Needs to be at least twice the number of direct mirrors (currently 15) plus some spare
+               max_clients => 50,
+               sslname     => 'security-master.debian.org',
        }
 }