X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=1277a9cfdc482cd0c7b27ff460a52ba003be4b66;hb=7a37eb9731a37f1fa7e42baa45f01dab65faa040;hp=6b447f9c5d80ed25240dd1158299c3b3b44c20c1;hpb=38e8fb687f0cb0f66d5a58d42e1f706b9d4c42e1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 6b447f9c5..1277a9cfd 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,55 +7,18 @@
 #   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  => Exec['service apache2 reload'],
-			key => true,
-		}
-	}
-
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'buildd') {
-		include buildd
-	}
-
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'porterbox') {
-		include porterbox
-	}
-
-	if has_role('bugs_mirror') {
-		include roles::bugs_mirror
-	}
-
-	if has_role('bugs_base') {
-		ssl::service { 'bugs.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
-	}
-	if has_role('bugs_master') {
-		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+		include nagios::server
 	}
 
 	if has_role('manpages-dyn') {
 		include roles::manpages_dyn
 	}
 
-	if has_role('archvsync_base_additional') {
-		include archvsync_base
-	}
-
 	# archive.debian.org
 	if has_role('historical_mirror') {
 		include roles::historical_mirror
@@ -70,9 +33,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp.d.o') {
-		include roles::ftp
-	}
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
@@ -99,6 +59,7 @@ class roles {
 		include roles::security_master
 		include roles::dakmaster
 	}
+
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -120,10 +81,6 @@ class roles {
 		ssl::service { 'cgi.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('keyring') {
-		include roles::keyring
-	}
-
 	if has_role('wiki') {
 		include roles::wiki
 	}
@@ -132,20 +89,6 @@ 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
 	}
@@ -159,11 +102,11 @@ class roles {
 	}
 
 	if has_role('dns_primary') {
-		include named::primary
+		include roles::dns_primary
 	}
 
-	if has_role('weblog_destination') {
-		include roles::weblog_destination
+	if has_role('dns_geo') {
+		include roles::dns_geodns
 	}
 
 	if has_role('vote') {
@@ -174,10 +117,6 @@ class roles {
 		include roles::security_tracker
 	}
 
-	if has_role('lists') {
-		include roles::lists
-	}
-
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -198,10 +137,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -217,14 +152,6 @@ class roles {
 		include roles::nm
 	}
 
-	if has_role('rtc') {
-		include roles::rtc
-	}
-
-	if has_role('jenkins') {
-		include roles::jenkins
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -279,21 +206,25 @@ class roles {
 		include roles::dgit_git
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04] {
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
 		include roles::snapshot
 	}
 
-	if has_role('veyepar.debian.org') {
-		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+	if has_role('snapshot_web') {
+		include roles::snapshot_web
 	}
-	if has_role('sreview.debian.org') {
-		ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+
+	if has_role('snapshot_shell') {
+		include roles::snapshot_shell
 	}
 
 	if has_role('debtags') {
 		include roles::debtags
 	}
 
+	if has_role('planet_master') {
+		include roles::planet_master
+	}
 	if has_role('planet_search') {
 		ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -346,10 +277,6 @@ class roles {
 		include bacula::storage
 	}
 
-	if has_role('salsa.debian.org') {
-		include salsa
-	}
-
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
@@ -357,4 +284,16 @@ class roles {
 	if has_role('popcon') {
 		include roles::popcon
 	}
+
+	if has_role('debsources') {
+		include roles::debsources
+	}
+
+	if has_role('debconf_wafer') {
+		include roles::debconf_wafer
+	}
+
+	if has_role('cdbuilder_local_mirror') {
+		include roles::cdbuilder_local_mirror
+	}
 }