X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=f287ec0c32c6c0fe059304199d9cd4649f8052f0;hb=29e997fcfccb12a19b9871228005d14fc6b9189e;hp=d5340689762e4d0df75023aa45cc6489ff4afa9a;hpb=2afc4a9dab3600b727b7f156a92dad4a71f44d79;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d53406897..f287ec0c3 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -62,8 +62,8 @@ class roles {
 		include roles::wiki
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
+	if getfromhash($site::nodeinfo, 'syncproxy') {
+		include roles::syncproxy
 	}
 
 	if getfromhash($site::nodeinfo, 'static_master') {
@@ -84,7 +84,23 @@ class roles {
 		include roles::mailrelay
 	}
 
+	if getfromhash($site::nodeinfo, 'pubsub') {
+		include roles::pubsub
+	}
+
 	if $::hostname in [ravel] {
 		include roles::weblog_destination
 	}
+
+	if $::hostname in [soler] {
+		ssl::service { 'security-tracker.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if $::hostname in [pejacevic] {
+		ssl::service { 'piuparts.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }