X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=da2313c138f12bf12f90ab0732a1df949420c7ad;hb=683ffc212c9c3a4d7e4a4ff98c94fb52a75a02ca;hp=a2dde9d3c863e7c651e2a567d7140da9efea142f;hpb=3e4e0946835e0ca9b9167b38ac17949754a0f120;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index a2dde9d3c..da2313c13 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,5 +1,4 @@
 class named {
-
 	munin::check { 'bind': }
 
 	site::aptrepo { 'bind-ratelimit':
@@ -16,16 +15,29 @@ class named {
 		ensure => running,
 	}
 
-	@ferm::rule { 'dsa-bind-no-ddos-any':
+	@ferm::rule { '00-dsa-bind-no-ddos-any':
 		domain      => '(ip ip6)',
 		description => 'Allow nameserver access',
 		rule        => 'proto udp dport 53 mod string from 32 to 64 algo bm hex-string \'|0000ff0001|\' jump DROP'
 	}
 
-	@ferm::rule { 'dsa-bind':
-		domain      => '(ip ip6)',
-		description => 'Allow nameserver access',
-		rule        => '&TCP_UDP_SERVICE(53)'
+	if getfromhash($site::nodeinfo, 'dns_primary') {
+		@ferm::rule { '01-dsa-bind-4':
+			domain      => '(ip)',
+			description => 'Allow nameserver access',
+			rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)',
+		}
+		@ferm::rule { '01-dsa-bind-6':
+			domain      => '(ip6)',
+			description => 'Allow nameserver access',
+			rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)',
+		}
+	} else {
+		@ferm::rule { '01-dsa-bind':
+			domain      => '(ip ip6)',
+			description => 'Allow nameserver access',
+			rule        => '&TCP_UDP_SERVICE(53)'
+		}
 	}
 
 	@ferm::rule { 'dsa-bind-notrack':