X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=a7f851611debe065e039eac069ca41f9cb293e8d;hb=da4d916ea39b5fa0115af28af54d379e7f859059;hp=35fb5103afd90067ddf75876404a2efb332f9de7;hpb=32c346e6fc2d7a7a78e95f63011a9e6cefc75637;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 35fb5103a..a7f851611 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -6,16 +6,14 @@ class roles::security_master {
 	}
 
 	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/',
+		ensure	=> absent,
+		root	=> '/nonexistent',
 	}
 
-	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',
 	}
 }