X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=3088d1e5c8e432ee13ec1177643d4479ae12ee5e;hb=1a22a9a4b1d7bb3c8bd1fc9041a5edf37b93232d;hp=3eb5dfdb5f2bf51c87d6391cb3c23267427088a2;hpb=8bb003cb1bb6c12b3909547aae210a46b609d0cd;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 3eb5dfdb5..3088d1e5c 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,181 +1,75 @@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+#   include roles
+#
 class roles {
-
-	if has_role('puppetmaster') {
-		include puppetmaster
-	}
-
 	if has_role('muninmaster') {
 		include munin::master
 	}
 
 	if has_role('nagiosmaster') {
-	#	include nagios::server
-		ssl::service { 'nagios.debian.org':
-			notify => Service['apache2'],
-		}
-	}
-
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
+		include nagios::server
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'porterbox') {
-		include porterbox
+	# archive.debian.org
+	if has_role('historical_mirror') {
+		include roles::historical_mirror
 	}
 
-	if has_role('bugs_mirror') {
-		include roles::bugs_mirror
+	# debug archive
+	if has_role('debug_mirror') {
+		include roles::debug_mirror
 	}
 
-	if has_role('bugs_base') {
-		ssl::service { 'bugs.debian.org':
-			notify => Service['apache2'],
-		}
-	}
-	if has_role('bugs_master') {
-		ssl::service { 'bugs-master.debian.org':
-			notify => Service['apache2'],
-		}
+	# 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
 	}
-
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-		include roles::security_mirror
-	}
-
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
-	}
-
-	if has_role('ftp.d.o') {
-		include roles::ftp
-	}
-
-	if has_role('ftp.upload.d.o') {
-		include roles::ftp_upload
-	}
-
+	#
+	# security.debian.org
 	if has_role('security_master') {
 		include roles::security_master
 		include roles::dakmaster
 	}
 
-	if has_role('www_master') {
-		include roles::www_master
-	}
-
-	if has_role('keyring') {
-		include roles::keyring
-	}
-
-	if has_role('wiki') {
-		include roles::wiki
+	if has_role('security_mirror') {
+		include roles::security_mirror
 	}
 
 	if has_role('syncproxy') {
 		include roles::syncproxy
 	}
 
-	if has_role('static_master') {
-		include roles::static_master
-	}
-
-	if has_role('static_mirror') {
-		include roles::static_mirror
-	} elsif has_role('static_source') {
-		include roles::static_source
-	}
-
-	if has_role('weblog_provider') {
-		include roles::weblog_provider
-	}
-
-	if has_role('mailrelay') {
-		include roles::mailrelay
-	}
-
-	if has_role('pubsub') {
-		include roles::pubsub
-	}
-
-	if has_role('dbmaster') {
-		include roles::dbmaster
-	}
-
-	if has_role('dns_primary') {
-		include named::primary
-	}
-	if has_role('dns_secondary') {
-		include named::authoritative
-	}
-
-	if has_role('weblog_destination') {
-		include roles::weblog_destination
-	}
-
-	if has_role('vote') {
-		include roles::vote
-	}
-
-	if has_role('security_tracker') {
-		include roles::security_tracker
-	}
-
-	if has_role('lists') {
-		include roles::lists
-	}
-
-	if has_role('rtmaster') {
-		include roles::rtmaster
-	}
-
-	if has_role('udd') {
-		include roles::udd
-	}
-
-	if has_role('sso') {
-		include roles::sso
-	}
-
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
-	if has_role('piuparts') {
-		include roles::piuparts
-	}
-
-	if has_role('contributors') {
-		include roles::contributors
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
 	}
 
-	if has_role('nm') {
-		include roles::nm
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
+		include roles::snapshot
 	}
 
-	if has_role('release') {
-		include roles::release
+	if has_role('ports_master') {
+		include roles::ports_master
 	}
 
-	if has_role('rtc') {
-		include roles::rtc
+	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('packages') {
-		ssl::service { 'packages.debian.org':
-			notify => Service['apache2'],
-		}
+	if $::keyring_debian_org_mirror {
+		include roles::keyring_debian_org_mirror
 	}
 }