X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=1481f30f0a6a1d0f59e3da704016a7aa57a11b03;hb=18c0f13969295f1989cfad3130ba0b52ddcb51a2;hp=1ce12c90778934317edbd658c143f627864a8575;hpb=c4e1f7da82af189fe739c4c28ba78cc2d200a425;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 1ce12c907..1481f30f0 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,13 +1,6 @@
 class named {
-
 	munin::check { 'bind': }
 
-	site::aptrepo { 'bind-ratelimit':
-		url        => 'http://db.debian.org/debian-admin',
-		suite      => 'bind-ratelimit',
-		components => 'main',
-	}
-
 	package { 'bind9':
 		ensure => installed
 	}
@@ -16,10 +9,29 @@ class named {
 		ensure => running,
 	}
 
-	@ferm::rule { 'dsa-bind':
+	@ferm::rule { '00-dsa-bind-no-ddos-any':
 		domain      => '(ip ip6)',
 		description => 'Allow nameserver access',
-		rule        => '&TCP_UDP_SERVICE(53)'
+		rule        => 'proto udp dport 53 mod string from 32 to 64 algo bm hex-string \'|0000ff0001|\' jump DROP'
+	}
+
+	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_GEO_V4 $HOST_NAGIOS_V4 $HOST_RCODE0_V4 $HOST_EASYDNS_V4 $HOST_NETNOD_V4 ) )',
+		}
+		@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 $HOST_NETNOD_V6 ) )',
+		}
+	} else {
+		@ferm::rule { '01-dsa-bind':
+			domain      => '(ip ip6)',
+			description => 'Allow nameserver access',
+			rule        => '&TCP_UDP_SERVICE(53)'
+		}
 	}
 
 	@ferm::rule { 'dsa-bind-notrack':
@@ -44,4 +56,12 @@ class named {
 		group  => bind,
 		mode   => '0775',
 	}
+
+	file { '/etc/bind/named.conf.puppet-shared-keys':
+		mode    => '0640',
+		content => template('named/named.conf.puppet-shared-keys.erb'),
+		owner   => root,
+		group   => bind,
+		notify  => Service['bind9'],
+	}
 }