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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fefab3fe4..fb571c56f 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,92 +7,18 @@
 #   include roles
 #
 class roles {
-	if has_role('muninmaster') {
-		include munin::master
-	}
-
-	if has_role('nagiosmaster') {
-		include nagios::server
-	}
-
-	# archive.debian.org
-	if has_role('historical_mirror') {
-		include roles::historical_mirror
-	}
-
-	# debug archive
-	if has_role('debug_mirror') {
-		include roles::debug_mirror
-	}
-
-	# ftp.debian.org and its ecosystem
-	if has_role('debian_mirror') {
-		include roles::debian_mirror
-	}
-	if has_role('ftp_master') {
-		include roles::ftp_master
-		include roles::dakmaster
-		include roles::signing
-	}
-	#
-	# security.debian.org
-	if has_role('security_master') {
-		include roles::security_master
-		include roles::dakmaster
-	}
-
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
 
-	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('rtmaster') {
-		include roles::rtmaster
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
 
-
-	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('ports_master') {
-		include roles::ports_master
-	}
-
-	if has_role('onionbalance') {
-		include onion::balance
-	}
-	if has_role('bgp') {
-		include roles::bgp
-	}
-
 	if has_role('postgresql_server') {
 		include postgres::backup_source
 	}
@@ -100,8 +26,4 @@ class roles {
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
-
-	if has_role('popcon') {
-		include roles::popcon
-	}
 }