X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=a178271bc2922749391847a61e2d87e52e280cbd;hb=89fb28ae8731fee3ed45b8642c6c9e3f96960e6a;hp=a9a200f1ec092296f4673e1972d4c72496e39159;hpb=ab9d167e68d57e55ce0c52785b21d4122e1c0f9f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index a9a200f1e..a178271bc 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,7 +1,12 @@
 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
 	}
@@ -10,10 +15,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_SECONDARY_V4 $HOST_DNS_GEO_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_DNS_GEO_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':
@@ -38,4 +62,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'],
+	}
 }