X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=41cec9a8796a506017deeb303f6a2776d774d3be;hb=f9d91d53528b62671c3ddaeb6f57b2eb4b713010;hp=8f1d39c93c94b33e4b8975ef09da39cd7a3da5fc;hpb=c83c71f4aa4da40edbbcb00a15f15376342aa6e7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 8f1d39c93..41cec9a87 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -2,9 +2,10 @@ class named {
 	munin::check { 'bind': }
 
 	site::aptrepo { 'bind-ratelimit':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'bind-ratelimit',
-		components => 'main',
+		ensure     => absent,
+		#url        => 'http://db.debian.org/debian-admin',
+		#suite      => 'bind-ratelimit',
+		#components => 'main',
 	}
 
 	package { 'bind9':
@@ -25,12 +26,12 @@ class named {
 		@ferm::rule { '01-dsa-bind-4':
 			domain      => '(ip)',
 			description => 'Allow nameserver access',
-			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_SECONDARY_V4 $HOST_DNS_GEO_V4 $HOST_NAGIOS_V4 $HOST_RCODE0_V4 $HOST_EASYDNS_V4 5.153.231.21 ) )',
+			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO_V4 $HOST_NAGIOS_V4 $HOST_RCODE0_V4 $HOST_EASYDNS_V4 $HOST_NETNOD_V4 5.153.231.21 ) )',
 		}
 		@ferm::rule { '01-dsa-bind-6':
 			domain      => '(ip6)',
 			description => 'Allow nameserver access',
-			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_SECONDARY_V6 $HOST_DNS_GEO_V6 $HOST_NAGIOS_V6 $HOST_RCODE0_V6 2001:41c8:1000:21::21:21 ) )',
+			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_GEO_V6 $HOST_NAGIOS_V6 $HOST_RCODE0_V6 2001:41c8:1000:21::21:21 ) )',
 		}
 	} else {
 		@ferm::rule { '01-dsa-bind':