X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Finit.pp;h=d425931752d6e8c3392ceea4f0d89b1b0ebcd428;hb=465fefd44c814b4e59d5cc2ab78f1c144196abeb;hp=49911f8b51f2f7e010facc70b5b1b42d18027dda;hpb=49922b83ef7b7c817e88210ac363f935cf11a110;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 49911f8b5..d42593175 100644
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -1,12 +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
 	}
@@ -21,25 +15,6 @@ class named {
 		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)',
-		}
-		@ferm::rule { '01-dsa-bind-6':
-			domain      => '(ip6)',
-			description => 'Allow nameserver access',
-			rule        => '&TCP_UDP_SERVICE_RANGE(53, $HOST_DNS_SECONDARY_V6)',
-		}
-	} else {
-		@ferm::rule { '01-dsa-bind':
-			domain      => '(ip ip6)',
-			description => 'Allow nameserver access',
-			rule        => '&TCP_UDP_SERVICE(53)'
-		}
-	}
-
 	@ferm::rule { 'dsa-bind-notrack':
 		domain      => '(ip ip6)',
 		description => 'NOTRACK for nameserver traffic',
@@ -62,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
+	}
 }