X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=d425931752d6e8c3392ceea4f0d89b1b0ebcd428;hb=2c50e8598c18a622f9bc638a404416b48ac92711;hp=9cc377e6e58e9c82c2b4f48a91743732c4fa2ae1;hpb=fa403c7eb2687ed007a843a6560d373b41a01905;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 9cc377e6e..d42593175 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,5 +1,4 @@
 class named {
-
 	munin::check { 'bind': }
 
 	package { 'bind9':
@@ -10,10 +9,10 @@ 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'
 	}
 
 	@ferm::rule { 'dsa-bind-notrack':
@@ -28,7 +27,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 +37,28 @@ class named {
 		group  => bind,
 		mode   => '0775',
 	}
+
+	file { '/etc/bind/named.conf.options':
+		content => template('named/named.conf.options.erb'),
+		notify  => Service['bind9'],
+	}
+
+	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'],
+	}
+
+	concat { '/etc/bind/named.conf.puppet-misc':
+		notify  => Service['bind9'],
+	}
+	concat::fragment { 'dsa-named-conf-puppet-misc---header':
+		target => '/etc/bind/named.conf.puppet-misc',
+		order  => '000',
+		content  => @(EOF)
+			// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+			| EOF
+	}
 }