X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=fefab3fe44d5031e33630311a12a0d49e7096960;hb=fba81eb4a038c11fe783d3b06ace198721844724;hp=2afec7f93ce9edd3bfa73df2647ba42251630a30;hpb=f577b6babf3b6c16f6783d037ce7acd4ed119557;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2afec7f93..fefab3fe4 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,10 +45,6 @@ class roles {
 		include roles::security_mirror
 	}
 
-	if has_role('wiki') {
-		include roles::wiki
-	}
-
 	if has_role('syncproxy') {
 		include roles::syncproxy
 	}
@@ -65,35 +61,15 @@ class roles {
 		include roles::dns_geodns
 	}
 
-	if has_role('security_tracker') {
-		include roles::security_tracker
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
 
-	if has_role('udd') {
-		include roles::udd
-	}
-
-	if has_role('sso') {
-		include roles::sso
-	}
-
-	if has_role('sso_rp') {
-		include roles::sso_rp
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
 
 
-	if has_role('qamaster') {
-		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('packagesqamaster') {
 		ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -106,10 +82,6 @@ class roles {
 		include roles::snapshot_web
 	}
 
-	if has_role('snapshot_shell') {
-		include roles::snapshot_shell
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}