X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_master.pp;h=ae3c471f021750b76ea976b6d1d41b3d20a3bb32;hb=f0592778e175dd64df69a349a716fe8ca89ad66f;hp=3f1b70cebd4dd8738999742b1de9f0c0c09d5513;hpb=6a02cbaab2c9399fb86b883037fad6e894b2d790;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 3f1b70ceb..ae3c471f0 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,10 +1,21 @@
 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,
+		chown_user => dak-unpriv,
 		root       => '/srv/ftp.root/',
 	}
+
+	rsync::site { 'security_master':
+		source        => 'puppet:///modules/roles/security_master/rsyncd.conf',
+		max_clients => 100,
+		sslname => "security-master.debian.org",
+	}
 }