X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=6b463a52de67b845f1fc416a3506f1a8883749f6;hb=2342f47256402a4e54d83cd32ce14302bab00c94;hp=6992537d773e62116a7874e3f6fdb778e3515c09;hpb=6f2b99d1b77cb7edefdeb8ed407139ef4c2bf447;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 6992537d7..6b463a52d 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,26 +1,22 @@
 class roles::security_master {
-
-	$bind = $::hostname ? {
-		default => '',
-	}
-
-	$bind6 = $::hostname ? {
-		default => '',
+	ssl::service { 'security-master.debian.org':
+		notify   => Exec['service apache2 reload'],
+		key      => true,
+		tlsaport => [443, 1873],
 	}
 
-	$logfile = '/var/log/ftp/vsftpd-security-master.debian.org.log'
-
 	vsftpd::site { 'security':
-		content => template('roles/security_master/vsftpd.conf.erb'),
-		logfile => $logfile,
-		bind    => $bind,
+		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/',
 	}
 
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			content => template('roles/security_master/vsftpd.conf.erb'),
-			logfile => $logfile,
-			bind    => $bind6,
-		}
+	rsync::site { 'security_master':
+		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',
 	}
 }