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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 137cd75e4..a4445ee9b 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,50 +1,71 @@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+#   include roles
+#
 class roles {
-
-	if getfromhash($site::nodeinfo, 'puppetmaster') {
-		include puppetmaster
-	}
-
-	if getfromhash($site::nodeinfo, 'muninmaster') {
+	if has_role('muninmaster') {
 		include munin::master
 	}
 
-	if getfromhash($site::nodeinfo, 'nagiosmaster') {
+	if has_role('nagiosmaster') {
 		include nagios::server
 	}
 
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
+	# archive.debian.org
+	if has_role('historical_mirror') {
+		include roles::historical_mirror
+	}
+
+	# debug archive
+	if has_role('debug_mirror') {
+		include roles::debug_mirror
 	}
 
-	if $::hostname in [chopin,franck,morricone,bizet] {
+	# 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 getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-		include roles::backports_mirror
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
+		include roles::snapshot
 	}
 
-	if getfromhash($site::nodeinfo, 'ftp.d.o') {
-		include roles::ftp
+	if has_role('ports_master') {
+		include roles::ports_master
 	}
 
-	if getfromhash($site::nodeinfo, 'ftp.upload.d.o') {
-		include roles::ftp_upload
+	if has_role('bgp') {
+		include roles::bgp
 	}
 
-	if $::hostname in [bizet,morricone] {
-		include roles::backports_master
+	if has_role('postgresql_server') {
+		include postgres::backup_source
 	}
 
-	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-		include roles::ftp-upcoming_mirror
+	if $::keyring_debian_org_mirror {
+		include roles::keyring_debian_org_mirror
 	}
 }