X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=6122e78cef27aac34fd9306c7df4e946a46f3618;hb=60761867cccbfa7f472fb13fdd2d704d4cb32b92;hp=3088d1e5c8e432ee13ec1177643d4479ae12ee5e;hpb=a6dec5b4a7f89cb14c6d50ab5febccc12a195004;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3088d1e5c..6122e78ce 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,75 +1,11 @@
 # = 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('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('bgp') {
-		include roles::bgp
-	}
-
-	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
+  }
 }