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

diff --git a/modules/roles/manifests/security_master.pp b/modules/roles/manifests/security_master.pp
index ae3c471f0..35fb5103a 100644
--- a/modules/roles/manifests/security_master.pp
+++ b/modules/roles/manifests/security_master.pp
@@ -1,8 +1,8 @@
 class roles::security_master {
-
 	ssl::service { 'security-master.debian.org':
-		notify => Service['apache2'],
-		key => true,
+		notify   => Exec['service apache2 reload'],
+		key      => true,
+		tlsaport => [443, 1873],
 	}
 
 	vsftpd::site { 'security':
@@ -13,9 +13,9 @@ class roles::security_master {
 		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",
+		sslname     => 'security-master.debian.org',
 	}
 }