X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=8bc6aa5b9112037d4d009968257ea38501191969;hb=afe8043a8dcc9ea09763565b40d9ba061b68ba36;hp=e447ebb19ed96642ebb2a3b75f4455c509c51ff7;hpb=dd7752715ac996b2783727efacf103a96ca43d3e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e447ebb19..8bc6aa5b9 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -17,11 +17,7 @@ class roles {
 	}
 
 	if has_role('nagiosmaster') {
-	#	include nagios::server
-		ssl::service { 'nagios.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
+		include nagios::server
 	}
 
 	# XXX: turn this into a real role
@@ -43,8 +39,13 @@ 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, }
 		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
@@ -160,6 +161,10 @@ class roles {
 		include named::primary
 	}
 
+	if has_role('dns_geo') {
+		include named::geodns
+	}
+
 	if has_role('weblog_destination') {
 		include roles::weblog_destination
 	}
@@ -281,11 +286,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') {
@@ -370,4 +383,16 @@ class roles {
 	if has_role('debconf_wafer') {
 		include roles::debconf_wafer
 	}
+
+	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
+	}
+
 }