Move creation of /etc/bind/named.conf.options from ::geodns and ::primary to parent

diff --git a/modules/named/manifests/authoritative.pp b/modules/named/manifests/authoritative.pp
index b924d6e..08b9236 100644 (file)
--- a/modules/named/manifests/authoritative.pp
+++ b/modules/named/manifests/authoritative.pp
@@ -1,8 +1,4 @@
 class named::authoritative inherits named {
-       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,

diff --git a/modules/named/manifests/geodns.pp b/modules/named/manifests/geodns.pp
index c4c6373..d9684f3 100644 (file)
--- a/modules/named/manifests/geodns.pp
+++ b/modules/named/manifests/geodns.pp
@@ -18,10 +18,6 @@ class named::geodns inherits named {
                ensure => directory,
                mode   => '0755',
        }
-       file { '/etc/bind/named.conf.options':
-               content => template('named/named.conf.options.erb'),
-               notify  => Service['bind9'],
-       }
        file { '/etc/bind/named.conf.local':
                source => 'puppet:///modules/named/common/named.conf.local',
                notify  => Service['bind9'],

diff --git a/modules/named/manifests/init.pp b/modules/named/manifests/init.pp
index 9b07e10..7de9a47 100644 (file)
--- a/modules/named/manifests/init.pp
+++ b/modules/named/manifests/init.pp
@@ -38,6 +38,11 @@ class named {
                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'),

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index cba9498..81d35ae 100644 (file)
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -37,10 +37,8 @@ options {
   str
 -%>
 
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
        dnssec-enable yes;
        dnssec-validation yes;
-<% end -%>
 
        // Defaults are 100 and 10, causing lots and lots of tiny updates.
        // This way, I hope, we'll get fewer (and thus bigger) updates. -- weasel