X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=a4445ee9b5f44e83c0cf9f3cc6dc75ecd7ca1205;hb=bf716a4daf9652bc9d1b77deac83a2b384fd78bc;hp=0ce9337a0aed41b9827ae06a729f450e001a30c5;hpb=97ba21fd4934fd10d98cf6abd1b7810a8447ba23;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 0ce9337a0..a4445ee9b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,9 +34,6 @@ class roles {
 		include roles::dakmaster
 		include roles::signing
 	}
-	if has_role('security_upload') {
-		include roles::security_upload
-	}
 	#
 	# security.debian.org
 	if has_role('security_master') {
@@ -48,104 +45,18 @@ class roles {
 		include roles::security_mirror
 	}
 
-	if has_role('git_master') {
-		include roles::git_master
-	}
-
-	if has_role('wiki') {
-		include roles::wiki
-	}
-
-	if has_role('syncproxy') {
-		include roles::syncproxy
-	}
-
-	if has_role('mailrelay') {
-		include roles::mailrelay
-	}
-
-	if has_role('dns_primary') {
-		include roles::dns_primary
-	}
-
-	if has_role('dns_geo') {
-		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('packages') {
-		ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	if has_role('historicalpackages') {
-		ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	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, }
-	}
-
 	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
 		include roles::snapshot
 	}
 
-	if has_role('snapshot_web') {
-		include roles::snapshot_web
-	}
-
-	if has_role('snapshot_shell') {
-		include roles::snapshot_shell
-	}
-
-	if has_role('planet_master') {
-		include roles::planet_master
-	}
-	if has_role('planet_search') {
-		ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	if has_role('i18n.d.o') {
-		ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
-	if has_role('l10n.d.o') {
-		ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-	}
-
 	if has_role('ports_master') {
 		include roles::ports_master
 	}
 
-	if has_role('onionbalance') {
-		include onion::balance
-	}
 	if has_role('bgp') {
 		include roles::bgp
 	}
@@ -157,8 +68,4 @@ class roles {
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
-
-	if has_role('popcon') {
-		include roles::popcon
-	}
 }