projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
named
/
manifests
/
geodns.pp
diff --git
a/modules/named/manifests/geodns.pp
b/modules/named/manifests/geodns.pp
index
191f898
..
766c5e5
100644
(file)
--- a/
modules/named/manifests/geodns.pp
+++ b/
modules/named/manifests/geodns.pp
@@
-25,8
+25,7
@@
class named::geodns inherits named {
group => root,
;
"/etc/bind/named.conf.options":
group => root,
;
"/etc/bind/named.conf.options":
- source => [ "puppet:///named/per-host/$fqdn/named.conf.options",
- "puppet:///named/common/named.conf.options" ],
+ content => template("named/named.conf.options.erb"),
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
@@
-69,12
+68,6
@@
class named::geodns inherits named {
group => geodnssync,
mode => 440,
;
group => geodnssync,
mode => 440,
;
- "/var/log/bind9":
- ensure => directory,
- owner => bind,
- group => bind,
- mode => 775,
- ;
}
}
}
}