X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=9e5e649eb5a7db848ba65682e5c0f0f921421713;hb=562a5017ec445c5a1fbf163b9d5a10667a9f17ea;hp=0633b43fe9abd59be330accbc0e62242fe3d3b38;hpb=b1555d788f0e43564fbdb4b9825e6bf6b7dd423b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 0633b43fe..9e5e649eb 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,127 +1,15 @@
 # = Class: roles
 #
-# Lookup role and include relevant classes for roles
-#
-# == Sample Usage:
-#
-#   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('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('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('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
-	}
+  if has_role('postgres_backup_server') {
+    include postgres::backup_server
+  }
 
-	if $::keyring_debian_org_mirror {
-		include roles::keyring_debian_org_mirror
-	}
+  if has_role('postgresql_server') {
+    include postgres::backup_source
+  }
 
-	if has_role('popcon') {
-		include roles::popcon
-	}
+  if $::keyring_debian_org_mirror {
+    include roles::keyring_debian_org_mirror
+  }
 }