X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=ae258efc6b7f05706bcb9ed3f1a13c48f61faac9;hb=e97755895177e0716d30c2c7e4fcd5cf4f92515a;hp=2c9ed9cb544fb70eb24d981399e6269d7f28af18;hpb=9ec891fd654df93c9991cea731a8ce5ffecf8939;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2c9ed9cb5..ae258efc6 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, }
@@ -158,7 +143,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 +186,6 @@ class roles {
 		include roles::tracker
 	}
 
-	if has_role('buildd_master') {
-		include roles::buildd_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -282,11 +267,19 @@ class roles {
 		include roles::snapshot
 	}
 
+	if has_role('snapshot_web') {
+		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') {
@@ -375,4 +368,11 @@ class roles {
 	if has_role('cdbuilder_local_mirror') {
 		include roles::cdbuilder_local_mirror
 	}
+
+	if has_role('alioth_archive') {
+		include roles::alioth_archive
+	}
+	if has_role('anonscm') {
+		include roles::anonscm
+	}
 }