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

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index a31db9fe3..365f3b092 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -5,17 +5,10 @@ class roles::security_master {
 		tlsaport => [443, 1873],
 	}
 
-	vsftpd::site_systemd { '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/',
-	}
-
-	rsync::site_systemd { 'security_master':
+	rsync::site { 'security_master':
 		source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
-		max_clients => 100,
+		# Needs to be at least twice the number of direct mirrors (currently 15) plus some spare
+		max_clients => 50,
 		sslname     => 'security-master.debian.org',
 	}
 }