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

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index 036f05990..35fb5103a 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,15 +1,21 @@
 class roles::security_master {
+	ssl::service { 'security-master.debian.org':
+		notify   => Exec['service apache2 reload'],
+		key      => true,
+		tlsaport => [443, 1873],
+	}
 
 	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',
+	rsync::site_systemd { 'security_master':
+		source      => 'puppet:///modules/roles/security_master/rsyncd.conf',
 		max_clients => 100,
+		sslname     => 'security-master.debian.org',
 	}
 }