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 git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
[mirror/dsa-puppet.git]
/
modules
/
named
/
manifests
/
geodns.pp
diff --git
a/modules/named/manifests/geodns.pp
b/modules/named/manifests/geodns.pp
index
1dd5711
..
a0c6d12
100644
(file)
--- a/
modules/named/manifests/geodns.pp
+++ b/
modules/named/manifests/geodns.pp
@@
-3,37
+3,52
@@
class named::geodns inherits named {
script => bind
}
script => bind
}
-
site::aptrepo { 'geoip
':
-
template => 'debian-org/etc/apt/sources.list.d/geoip.list.erb'
,
+
package { 'geoip-database
':
+
ensure => installed
,
}
}
+ #site::aptrepo { 'geoip':
+ # url => 'http://db.debian.org/debian-admin',
+ # suite => 'lenny-bind-geoip',
+ # components => 'main',
+ #}
+ site::aptrepo { 'geoip': ensure => absent }
+
file { '/etc/bind/':
ensure => directory,
file { '/etc/bind/':
ensure => directory,
+ group => bind,
+ mode => '2755',
require => Package['bind9'],
notify => Service['bind9'],
}
file { '/etc/bind/geodns':
ensure => directory,
require => Package['bind9'],
notify => Service['bind9'],
}
file { '/etc/bind/geodns':
ensure => directory,
+ mode => '0755',
}
file { '/etc/bind/named.conf.options':
content => template('named/named.conf.options.erb'),
}
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',
}
file { '/etc/bind/named.conf.local':
source => 'puppet:///modules/named/common/named.conf.local',
+ notify => Service['bind9'],
}
file { '/etc/bind/named.conf.acl':
source => 'puppet:///modules/named/common/named.conf.acl',
}
file { '/etc/bind/named.conf.acl':
source => 'puppet:///modules/named/common/named.conf.acl',
+ notify => Service['bind9'],
}
file { '/etc/bind/geodns/zonefiles':
ensure => directory,
owner => geodnssync,
group => geodnssync,
}
file { '/etc/bind/geodns/zonefiles':
ensure => directory,
owner => geodnssync,
group => geodnssync,
- mode => '
0
755',
+ mode => '
2
755',
}
file { '/etc/bind/geodns/named.conf.geo':
source => 'puppet:///modules/named/common/named.conf.geo',
}
file { '/etc/bind/geodns/named.conf.geo':
source => 'puppet:///modules/named/common/named.conf.geo',
+ notify => Service['bind9'],
}
file { '/etc/bind/geodns/trigger':
}
file { '/etc/bind/geodns/trigger':
+ mode => '0555',
source => 'puppet:///modules/named/common/trigger',
}
file { '/etc/ssh/userkeys/geodnssync':
source => 'puppet:///modules/named/common/trigger',
}
file { '/etc/ssh/userkeys/geodnssync':