From 7b4f24c7e7b0a1e9f85bd2c46d97714a4cebff0f Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Sep 2010 21:53:47 +0200
Subject: [PATCH] s/secondary/authoritative/

---
 manifests/site.pp                                          | 4 ++--
 modules/named/manifests/{secondary.pp => authoritative.pp} | 2 +-
 modules/named/templates/named.conf.options.erb             | 4 ++--
 modules/samhain/templates/samhainrc.erb                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename modules/named/manifests/{secondary.pp => authoritative.pp} (93%)

diff --git a/manifests/site.pp b/manifests/site.pp
index 9b00836e..89527a6e 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/secondary.pp b/modules/named/manifests/authoritative.pp
similarity index 93%
rename from modules/named/manifests/secondary.pp
rename to modules/named/manifests/authoritative.pp
index 4f0494e2..4ffba00d 100644
--- a/modules/named/manifests/secondary.pp
+++ b/modules/named/manifests/authoritative.pp
@@ -1,4 +1,4 @@
-class named::secondary inherits named {
+class named::authoritative inherits named {
     file {
         "/etc/bind/named.conf.debian-zones":
             source  => [ "puppet:///modules/named/per-host/$fqdn/named.conf.debian-zones",
diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index 84469dff..3a2624a8 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 b3defd5c..3c5bec9d 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 -%>
-- 
2.39.2