X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a15eecf1c08fbd8e0d736da54bdad590b24930b5;hb=4b4d1fb6ea2b229c2fd454bbc01e295a9ee52705;hp=7ff4457af629f25c1ba2dbc9af4a4d0a0e6be860;hpb=eb86cec8a0737b9d471c0df4221694c68319597e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 7ff4457af..a15eecf1c 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -16,6 +16,10 @@ class roles {
 		include buildd
 	}
 
+	if getfromhash($site::nodeinfo, 'porterbox') {
+		include porterbox
+	}
+
 	if getfromhash($site::nodeinfo, 'bugs_mirror') {
 		include roles::bugs_mirror
 	}
@@ -54,8 +58,12 @@ class roles {
 		include roles::keyring
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
+	if getfromhash($site::nodeinfo, 'wiki') {
+		include roles::wiki
+	}
+
+	if getfromhash($site::nodeinfo, 'syncproxy') {
+		include roles::syncproxy
 	}
 
 	if getfromhash($site::nodeinfo, 'static_master') {
@@ -71,7 +79,37 @@ class roles {
 	if getfromhash($site::nodeinfo, 'weblog_provider') {
 		include roles::weblog_provider
 	}
+
+	if getfromhash($site::nodeinfo, 'mailrelay') {
+		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'],
+		}
+	}
+
+	if $::hostname in [nono] {
+		ssl::service { 'nm.debian.org':
+			notify => Service['apache2'],
+		}
+		ssl::service { 'contributors.debian.org':
+			notify => Service['apache2'],
+		}
+	}
 }