X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=29416e82290a039908af27b36d5ac19487b844bb;hb=e8ce3758531d3d751c8d5fe1923535052cd98f90;hp=d51a9bc86e407076063d3ac4d86f1c5d379deb22;hpb=584f12fb4c5f6ce47a187868570f439f543b635d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d51a9bc86..29416e822 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,82 +1,19 @@
 # = 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('dns_primary') {
-		include roles::dns_primary
-	}
-
-	if has_role('postgres_backup_server') {
-		include postgres::backup_server
-	}
-
-	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
-		include roles::snapshot
-	}
-
-	if has_role('ports_master') {
-		include roles::ports_master
-	}
+  if has_role('security_mirror') {
+    include roles::security_mirror
+  }
 
-	if has_role('onionbalance') {
-		include onion::balance
-	}
-	if has_role('bgp') {
-		include roles::bgp
-	}
+  if has_role('postgres_backup_server') {
+    include postgres::backup_server
+  }
 
-	if has_role('postgresql_server') {
-		include postgres::backup_source
-	}
+  if has_role('postgresql_server') {
+    include postgres::backup_source
+  }
 
-	if $::keyring_debian_org_mirror {
-		include roles::keyring_debian_org_mirror
-	}
+  if $::keyring_debian_org_mirror {
+    include roles::keyring_debian_org_mirror
+  }
 }