X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Fmanifests%2Fauthoritative.pp;h=5a3814107b8e34e572fc832543c25ca0452960f6;hb=f2710a0f5c4ee706cd811ca81d96e72f0f29d29e;hp=4ffba00dc81e7319c2c57adddf6859fe4d605d01;hpb=7b4f24c7e7b0a1e9f85bd2c46d97714a4cebff0f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/manifests/authoritative.pp b/modules/named/manifests/authoritative.pp
index 4ffba00dc..5a3814107 100644
--- a/modules/named/manifests/authoritative.pp
+++ b/modules/named/manifests/authoritative.pp
@@ -1,20 +1,22 @@
 class named::authoritative inherits named {
-    file {
-        "/etc/bind/named.conf.debian-zones":
-            source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.debian-zones",
-                         "puppet:///modules/named/common/named.conf.debian-zones" ],
-            notify  => Exec["bind9 reload"];
-        "/etc/bind/named.conf.options":
-            content => template("named/named.conf.options.erb"),
-            notify  => Exec["bind9 reload"];
-    }
-    file { "/etc/bind/named.conf.shared-keys":
-        mode    => 640,
-        owner   => root,
-        group   => bind,
-    }
+	file { '/etc/bind/named.conf.debian-zones':
+		content => template('named/named.conf.debian-zones.erb'),
+		notify  => Service['bind9'],
+	}
+	file { '/etc/bind/named.conf.options':
+		content => template('named/named.conf.options.erb'),
+		notify  => Service['bind9'],
+	}
+	file { '/etc/bind/named.conf.shared-keys':
+		mode    => '0640',
+		owner   => root,
+		group   => bind,
+	}
+	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'],
+	}
 }
-
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: