From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Sep 2010 19:53:47 +0000 (+0200)
Subject: s/secondary/authoritative/
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7b4f24c7e7b0a1e9f85bd2c46d97714a4cebff0f;p=mirror%2Fdsa-puppet.git

s/secondary/authoritative/
---

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b00836e8..89527a6ed 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -80,8 +80,8 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff: { include named::secondary }
-        geo1,geo2,geo3:           { include named::geodns }
+        klecker,ravel,senfl,orff,draghi: { include named::authoritative }
+        geo1,geo2,geo3:                  { include named::geodns }
         bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
diff --git a/modules/named/manifests/authoritative.pp b/modules/named/manifests/authoritative.pp
new file mode 100644
index 000000000..4ffba00dc
--- /dev/null
+++ b/modules/named/manifests/authoritative.pp
@@ -0,0 +1,20 @@
+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,
+    }
+}
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp
deleted file mode 100644
index 4f0494e2a..000000000
--- a/modules/named/manifests/secondary.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class named::secondary 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,
-    }
-}
-
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 84469dfff..3a2624a80 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -30,7 +30,7 @@ options {
 
 <%=
   allowed='Nagios; '
-  if classes.include?('named::secondary') or classes.include?('named::recursor')
+  if classes.include?('named::authoritative') or classes.include?('named::recursor')
     allowed += 'localnets; '
   end
 
@@ -40,7 +40,7 @@ options {
   str
 -%>
 
-<% if classes.include?('named::secondary') or classes.include?('named::geodns') -%>
+<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
 	dnssec-enable yes;
 	dnssec-validation yes;
 <% end -%>
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index b3defd5ca..3c5bec9df 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -377,7 +377,7 @@ dir=8/etc/puppet
 <% if classes.include?('named::geodns') -%>
 dir=1/etc/bind/geodns
 <% end -%>
-<% if classes.include?('named::secondary') -%>
+<% if classes.include?('named::authoritative') -%>
 dir=1/etc/bind
 file=/etc/bind/named.conf.debian-zones
 <% end -%>