projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c4e90c
)
Move creation of /etc/bind/named.conf.options from ::geodns and ::primary to parent
author
Peter Palfrader
<peter@palfrader.org>
Sun, 7 Jul 2019 09:08:30 +0000
(11:08 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sun, 7 Jul 2019 09:08:30 +0000
(11:08 +0200)
modules/named/manifests/authoritative.pp
patch
|
blob
|
history
modules/named/manifests/geodns.pp
patch
|
blob
|
history
modules/named/manifests/init.pp
patch
|
blob
|
history
modules/named/templates/named.conf.options.erb
patch
|
blob
|
history
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 {
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,
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',
}
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'],
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',
}
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'),
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
-%>
str
-%>
-<% if classes.include?('named::authoritative') or classes.include?('named::geodns') -%>
dnssec-enable yes;
dnssec-validation yes;
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
// 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