projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do it differently
[mirror/dsa-puppet.git]
/
modules
/
named
/
manifests
/
geodns.pp
diff --git
a/modules/named/manifests/geodns.pp
b/modules/named/manifests/geodns.pp
index
34ec1cd
..
76cfe3c
100644
(file)
--- a/
modules/named/manifests/geodns.pp
+++ b/
modules/named/manifests/geodns.pp
@@
-12,16
+12,16
@@
class named::geodns inherits named {
notify => Exec["apt-get update"],
;
"/etc/bind/named.conf.local":
notify => Exec["apt-get update"],
;
"/etc/bind/named.conf.local":
- source => [ "puppet:///named/per-host/$fqdn/named.conf.local",
- "puppet:///named/common/named.conf.local" ],
+ source => [ "puppet:///
modules/
named/per-host/$fqdn/named.conf.local",
+ "puppet:///
modules/
named/common/named.conf.local" ],
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
group => root,
;
"/etc/bind/named.conf.acl":
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
group => root,
;
"/etc/bind/named.conf.acl":
- source => [ "puppet:///named/per-host/$fqdn/named.conf.acl",
- "puppet:///named/common/named.conf.acl" ],
+ source => [ "puppet:///
modules/
named/per-host/$fqdn/named.conf.acl",
+ "puppet:///
modules/
named/common/named.conf.acl" ],
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
@@
-30,38
+30,43
@@
class named::geodns inherits named {
"/etc/bind/geodns":
ensure => directory,
owner => root,
"/etc/bind/geodns":
ensure => directory,
owner => root,
+ group => root,
+ mode => 755,
+ ;
+ "/etc/bind/geodns/zonefiles":
+ ensure => directory,
+ owner => geodnssync,
group => geodnssync,
group => geodnssync,
- mode => 7
7
5,
+ mode => 7
5
5,
;
"/etc/bind/geodns/named.conf.geo":
;
"/etc/bind/geodns/named.conf.geo":
- source => [ "puppet:///named/per-host/$fqdn/named.conf.geo",
- "puppet:///named/common/named.conf.geo" ],
+ source => [ "puppet:///
modules/
named/per-host/$fqdn/named.conf.geo",
+ "puppet:///
modules/
named/common/named.conf.geo" ],
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
group => root,
;
require => Package["bind9"],
notify => Exec["bind9 restart"],
owner => root,
group => root,
;
- "/etc/bind/geodns/
recvconf
":
- source => [ "puppet:///
named/per-host/$fqdn/recvconf
",
- "puppet:///
named/common/recvconf
" ],
+ "/etc/bind/geodns/
trigger
":
+ source => [ "puppet:///
modules/named/per-host/$fqdn/trigger
",
+ "puppet:///
modules/named/common/trigger
" ],
owner => root,
group => root,
mode => 555,
;
owner => root,
group => root,
mode => 555,
;
- "/etc/bind/geodns/recvconf.files":
- source => [ "puppet:///named/per-host/$fqdn/recvconf.files",
- "puppet:///named/common/recvconf.files" ],
- owner => root,
- group => root,
- mode => 444,
- ;
"/etc/ssh/userkeys/geodnssync":
"/etc/ssh/userkeys/geodnssync":
- source => [ "puppet:///named/per-host/$fqdn/authorized_keys",
- "puppet:///named/common/authorized_keys" ],
+ source => [ "puppet:///
modules/
named/per-host/$fqdn/authorized_keys",
+ "puppet:///
modules/
named/common/authorized_keys" ],
owner => root,
group => geodnssync,
mode => 440,
;
owner => root,
group => geodnssync,
mode => 440,
;
+ "/etc/cron.d/dsa-boot-geodnssync":
+ source => [ "puppet:///modules/named/per-host/$fqdn/cron-geo",
+ "puppet:///modules/named/common/cron-geo" ],
+ owner => root,
+ group => root,
+ ;
}
}
}
}