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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 331aa1180..f287ec0c3 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -14,10 +14,10 @@ class roles {
 
 	if getfromhash($site::nodeinfo, 'buildd') {
 		include buildd
-	} else {
-		class { 'buildd':
-			ensure => absent
-		}
+	}
+
+	if getfromhash($site::nodeinfo, 'porterbox') {
+		include porterbox
 	}
 
 	if getfromhash($site::nodeinfo, 'bugs_mirror') {
@@ -37,10 +37,6 @@ class roles {
 		include roles::www_mirror
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-		include roles::backports_mirror
-	}
-
 	if getfromhash($site::nodeinfo, 'ftp.d.o') {
 		include roles::ftp
 	}
@@ -49,11 +45,6 @@ class roles {
 		include roles::ftp_upload
 	}
 
-	if getfromhash($site::nodeinfo, 'backports_master') {
-		include roles::backports_master
-		include roles::dakmaster
-	}
-
 	if getfromhash($site::nodeinfo, 'security_master') {
 		include roles::security_master
 		include roles::dakmaster
@@ -67,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') {
@@ -80,4 +75,32 @@ class roles {
 	} elsif getfromhash($site::nodeinfo, 'static_source') {
 		include roles::static_source
 	}
+
+	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'],
+		}
+	}
 }