X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=fbd564b79ded57e1ceab39e62f6c47bfc9cbb964;hb=6aa9951b699fd189adca040842264758395650d5;hp=e5c8e3ad5235cec958bc0a9d688081bd2ea1bae2;hpb=9c2c8ca01f9ad72506e7d765129425a314ed3a88;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e5c8e3ad5..fbd564b79 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,6 +39,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, }
@@ -286,6 +286,10 @@ 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, }
 	}
@@ -383,4 +387,8 @@ class roles {
 	if has_role('alioth_archive') {
 		include roles::alioth_archive
 	}
+	if has_role('anonscm') {
+		include roles::anonscm
+	}
+
 }