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

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index da2313c13..c7d26a8e6 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -21,16 +21,16 @@ class named {
 		rule        => 'proto udp dport 53 mod string from 32 to 64 algo bm hex-string \'|0000ff0001|\' jump DROP'
 	}
 
-	if getfromhash($site::nodeinfo, 'dns_primary') {
+	if has_role('dns_primary') {
 		@ferm::rule { '01-dsa-bind-4':
 			domain      => '(ip)',
 			description => 'Allow nameserver access',
-			rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V4)',
+			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_SECONDARY_V4 $HOST_NAGIOS_V4 ) )',
 		}
 		@ferm::rule { '01-dsa-bind-6':
 			domain      => '(ip6)',
 			description => 'Allow nameserver access',
-			rule        => '&SERVICE_RANGE(tcp, 5671, $HOST_DEBIAN_V6)',
+			rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_DNS_SECONDARY_V6 $HOST_NAGIOS_V6 ) )',
 		}
 	} else {
 		@ferm::rule { '01-dsa-bind':