X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=41cec9a8796a506017deeb303f6a2776d774d3be;hb=fa3bd8c2a8a250493cd1aa0e49b6a368ad10958e;hp=9cc377e6e58e9c82c2b4f48a91743732c4fa2ae1;hpb=fa403c7eb2687ed007a843a6560d373b41a01905;p=dsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 9cc377e6..41cec9a8 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,7 +1,13 @@
 class named {
-
 	munin::check { 'bind': }
 
+	site::aptrepo { 'bind-ratelimit':
+		ensure     => absent,
+		#url        => 'http://db.debian.org/debian-admin',
+		#suite      => 'bind-ratelimit',
+		#components => 'main',
+	}
+
 	package { 'bind9':
 		ensure => installed
 	}
@@ -10,10 +16,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 5.153.231.21 ) )',
+		}
+		@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 2001:41c8:1000:21::21:21 ) )',
+		}
+	} else {
+		@ferm::rule { '01-dsa-bind':
+			domain      => '(ip ip6)',
+			description => 'Allow nameserver access',
+			rule        => '&TCP_UDP_SERVICE(53)'
+		}
 	}
 
 	@ferm::rule { 'dsa-bind-notrack':
@@ -28,7 +53,7 @@ class named {
 		domain      => '(ip ip6)',
 		description => 'NOTRACK for nameserver traffic',
 		table       => 'raw',
-		chain       => 'PREROUTING',
+		chain       => 'OUTPUT',
 		rule        => 'proto (tcp udp) sport 53 jump NOTRACK'
 	}
 
@@ -38,4 +63,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'],
+	}
 }