X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=bc752fb8737c0fc9f1445fdcb868e413fdcf7635;hb=c2097f5dd0a8519b555322ba5a8983798115a037;hp=c0b46e2d8e0c15c6537837eed3b9b19e63932a1e;hpb=deeab74647d436893c5bf0833e8f2314643d7c17;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index c0b46e2d8..bc752fb87 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,101 +7,49 @@
 #   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'],
-		}
+	# ftp.debian.org and its ecosystem
+	if has_role('debian_mirror') {
+		include roles::debian_mirror
 	}
-	if has_role('bugs_master') {
-		ssl::service { 'bugs-master.debian.org':
-			notify => Service['apache2'],
-		}
-	}
-
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
+		include roles::signing
 	}
-
-	if has_role('api.ftp-master') {
-		ssl::service { 'api.ftp-master.debian.org':
-			notify => Service['apache2'],
-		}
-	}
-
-	# 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
-	}
-
-	if has_role('ssh.upload.d.o') {
-		include roles::ssh_upload
+	if has_role('security_upload') {
+		include roles::security_upload
 	}
-
-	if has_role('git_master') {
-		include roles::git_master
-	}
-
-	if has_role('people') {
-		ssl::service { 'people.debian.org':
-			notify => Service['apache2'],
-		}
-	}
-
+	#
+	# 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('security_mirror') {
+		include roles::security_mirror
 	}
 
-	if has_role('keyring') {
-		include roles::keyring
+	if has_role('git_master') {
+		include roles::git_master
 	}
 
 	if has_role('wiki') {
@@ -112,56 +60,22 @@ class roles {
 		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
+		include roles::dns_primary
 	}
 
-	if has_role('weblog_destination') {
-		include roles::weblog_destination
-	}
-
-	if has_role('vote') {
-		include roles::vote
+	if has_role('dns_geo') {
+		include roles::dns_geodns
 	}
 
 	if has_role('security_tracker') {
 		include roles::security_tracker
 	}
 
-	if has_role('lists') {
-		include roles::lists
-	}
-
-	if has_role('list_search') {
-		include roles::listsearch
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -178,92 +92,51 @@ class roles {
 		include roles::sso_rp
 	}
 
-	if has_role('tracker') {
-		include roles::tracker
-	}
-
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
-	if has_role('buildd_ports_master') {
-		include roles::buildd_ports_master
-	}
-
-	if has_role('piuparts') {
-		include roles::piuparts
-	}
-
-	if has_role('contributors') {
-		include roles::contributors
-	}
-
-	if has_role('nm') {
-		include roles::nm
+	if has_role('postgres_backup_server') {
+		include postgres::backup_server
 	}
 
-	if has_role('release') {
-		include roles::release
-	}
 
-	if has_role('rtc') {
-		include roles::rtc
+	if has_role('qamaster') {
+		ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('keystone') {
-		include roles::keystone
-	}
-	if has_role('keystone_rabbitmq') {
-		include roles::keystone::rabbitmq
+	if has_role('packagesqamaster') {
+		ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('memcached') {
-		include roles::memcached
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
+		include roles::snapshot
 	}
 
-	if has_role('postgres_backup_server') {
-		include postgres::backup_server
+	if has_role('snapshot_web') {
+		include roles::snapshot_web
 	}
 
-	if has_role('packages') {
-		ssl::service { 'packages.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('snapshot_shell') {
+		include roles::snapshot_shell
 	}
 
-	if has_role('qamaster') {
-		ssl::service { 'qa.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('ports_master') {
+		include roles::ports_master
 	}
 
-	if has_role('packagesqamaster') {
-		ssl::service { 'packages.qa.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('onionbalance') {
+		include onion::balance
 	}
-
-	if has_role('gobby_debian_org') {
-		ssl::service { 'gobby.debian.org':
-			notify => Service['apache2'],
-		}
+	if has_role('bgp') {
+		include roles::bgp
 	}
 
-	if has_role('search_backend') {
-		include search_backend
-	}
-	if has_role('search_frontend') {
-		include search_frontend
+	if has_role('postgresql_server') {
+		include postgres::backup_source
 	}
 
-	if has_role('dgit_browse') {
-		include dgit_browse
-	}
-	if has_role('dgit_git') {
-		include dgit_git
+	if $::keyring_debian_org_mirror {
+		include roles::keyring_debian_org_mirror
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04] {
-		include snapshot
+	if has_role('popcon') {
+		include roles::popcon
 	}
 }