X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=0a3e136b5718398b612287493470f20ad1d90718;hb=992b52bab4325e38d1738e21652d052ae4cc90e5;hp=b17314fa12850c8468b43d3eb9cd3103ce8743ce;hpb=6fb1e1c8946a66aa57f40d55c681b7d492e2e50b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index b17314fa1..0a3e136b5 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,31 +7,12 @@
 #   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
+		include nagios::server
 	}
 
 	if has_role('bugs_mirror') {
@@ -43,6 +24,10 @@ class roles {
 			notify  => Exec['service apache2 reload'],
 			key => true,
 		}
+		ferm::rule { 'dsa-bugs-abusers':
+			prio	=> "005",
+			rule	=> "saddr (220.243.135/24 220.243.136/24) DROP",
+		}
 	}
 	if has_role('bugs_master') {
 		ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
@@ -53,10 +38,6 @@ class roles {
 		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
@@ -131,16 +112,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
 	}
@@ -158,7 +129,11 @@ class roles {
 	}
 
 	if has_role('dns_primary') {
-		include named::primary
+		include roles::dns_primary
+	}
+
+	if has_role('dns_geo') {
+		include roles::dns_geodns
 	}
 
 	if has_role('weblog_destination') {
@@ -197,10 +172,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -220,10 +191,6 @@ class roles {
 		include roles::rtc
 	}
 
-	if has_role('jenkins') {
-		include roles::jenkins
-	}
-
 	if has_role('postgres_backup_server') {
 		include postgres::backup_server
 	}
@@ -286,11 +253,15 @@ class roles {
 		include roles::snapshot_web
 	}
 
+	if has_role('snapshot_shell') {
+		include roles::snapshot_shell
+	}
+
 	if has_role('veyepar.debian.org') {
-		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
+		include roles::veyepar
 	}
 	if has_role('sreview.debian.org') {
-		ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
+		include roles::sreview
 	}
 
 	if has_role('debtags') {
@@ -368,10 +339,6 @@ class roles {
 		include roles::debsources
 	}
 
-	if has_role('ipsec') {
-		include ipsec
-	}
-
 	if has_role('debconf_wafer') {
 		include roles::debconf_wafer
 	}
@@ -380,14 +347,7 @@ class roles {
 		include roles::cdbuilder_local_mirror
 	}
 
-	if has_role('alioth_archive') {
-		include roles::alioth_archive
-	}
-
-	if has_role('kanboard') {
-		include apache2
-		package {'php-gd': ensure => installed }
-		package {'php-pgsql': ensure => installed }
-		package {'libapache2-mod-php': ensure => installed }
+	if has_role('anonscm') {
+		include roles::anonscm
 	}
 }