X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=f731dffcf703cef6b268751b7a7cbe6167221b29;hb=de84bd474e9c26f9fd5a645a331cf858daae0123;hp=ee252e3c0ab97b79b9f91eb329a0f037dadd08a3;hpb=7b368189c4367bd0c2bf902d58c4c2a05d05c9ce;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index ee252e3c0..f731dffcf 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_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_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 $HOST_NETNOD_V6 2001:41c8:1000:21::21:21 ) )',
 		}
 	} else {
 		@ferm::rule { '01-dsa-bind':