X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=365f3b09252fd0ce7812e3d175b6bfa9e193bfc6;hb=40ea2eb95b19f449abb6f60b04caccd8e4a7510b;hp=a96dbec50dc6a9d07a5f8c5e8e12d0f016b995d7;hpb=8e104735c829bddd66c9f0aacfa0f41e92eed57d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index a96dbec50..365f3b092 100644
--- 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  => Exec['service apache2 reload'],
-		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',
 	}
 }