X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=13ac0162614ac90130e7b26c200f3637c46a00d7;hb=236efe8e28f32419ddc5b4445780bd17775adaf3;hp=22f9af6e1453e88253ad6ec6310becce1c89c817;hpb=3443e44bc5ddeb5191237f3c4111ee7e4acbc8de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 22f9af6e1..13ac01626 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -39,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, }
@@ -157,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
 	}
@@ -287,10 +295,10 @@ class roles {
 	}
 
 	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') {
@@ -387,4 +395,7 @@ class roles {
 		include roles::anonscm
 	}
 
+	if has_role('loghost') {
+		include roles::loghost
+	}
 }