X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=0fa51233111a8531d7b1acc480673071d9f2670a;hb=94c953105bbf0e333d448e57f09f08f4cfae7623;hp=a2dde9d3c863e7c651e2a567d7140da9efea142f;hpb=1a2b96081cd2d9f1492630b1ebb60331e7db5a06;p=dsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index a2dde9d3..0fa51233 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 has_role('dns_primary') {
+		@ferm::rule { '01-dsa-bind-4':
+			domain      => '(ip)',
+			description => 'Allow nameserver access',
+			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_SECONDARY_V4 $HOST_NAGIOS_V4 $HOST_RCODE0_V4 $HOST_EASYDNS_V4 ) )',
+		}
+		@ferm::rule { '01-dsa-bind-6':
+			domain      => '(ip6)',
+			description => 'Allow nameserver access',
+			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_SECONDARY_V6 $HOST_NAGIOS_V6 $HOST_RCODE0_V6 ) )',
+		}
+	} else {
+		@ferm::rule { '01-dsa-bind':
+			domain      => '(ip ip6)',
+			description => 'Allow nameserver access',
+			rule        => '&TCP_UDP_SERVICE(53)'
+		}
 	}
 
 	@ferm::rule { 'dsa-bind-notrack':