X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=125f7630a8a376f0cf0b947b35d9007e57fc0da4;hb=80049abfc48717a7e1d4f5691260a2f7fa8983af;hp=4c8668471154fb97fd8e8ba1bdc838da9945a5ee;hpb=6a94b204599f27a5ec786e03242b594fb51bc7fc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4c8668471..125f7630a 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -69,6 +69,10 @@ class roles {
 		include roles::www_mirror
 	}
 
+	if has_role('mirror_debug') {
+		include roles::debug_mirror
+	}
+
 	if has_role('ftp.d.o') {
 		include roles::ftp
 	}
@@ -174,6 +178,10 @@ class roles {
 		include roles::sso
 	}
 
+	if has_role('sso_rp') {
+		include roles::sso_rp
+	}
+
 	if has_role('tracker') {
 		include roles::tracker
 	}
@@ -182,10 +190,6 @@ class roles {
 		include roles::buildd_master
 	}
 
-	if has_role('buildd_ports_master') {
-		include roles::buildd_ports_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -206,6 +210,10 @@ class roles {
 		include roles::rtc
 	}
 
+	if has_role('jenkins') {
+		include roles::jenkins
+	}
+
 	if has_role('keystone') {
 		include roles::keystone
 	}
@@ -258,4 +266,29 @@ class roles {
 	if has_role('dgit_git') {
 		include dgit_git
 	}
+
+	if $::hostname in [lw01, lw02, lw03, lw04] {
+		include snapshot
+	}
+
+	if has_role('veyepar.debian.org') {
+		ssl::service { 'veyepar.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
+	if has_role('httpredir') {
+		include roles::httpredir
+	}
+
+	if has_role('debtags') {
+		include roles::debtags
+	}
+
+	if has_role('planet_search') {
+		ssl::service { 'planet-search.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
 }