projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop using virtual resources for ferm::rule
[mirror/dsa-puppet.git]
/
modules
/
named
/
manifests
/
geodns.pp
diff --git
a/modules/named/manifests/geodns.pp
b/modules/named/manifests/geodns.pp
index
649268a
..
b12ed7f
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'],
@@
-51,11
+47,6
@@
class named::geodns inherits named {
mode => '0555',
source => 'puppet:///modules/named/common/trigger',
}
mode => '0555',
source => 'puppet:///modules/named/common/trigger',
}
- file { '/etc/ssh/userkeys/geodnssync':
- source => 'puppet:///modules/named/common/authorized_keys',
- group => geodnssync,
- mode => '0440',
- }
file { '/etc/cron.d/dsa-boot-geodnssync': ensure => absent; }
concat::fragment { 'dsa-puppet-stuff--geodns-boot':
target => '/etc/cron.d/dsa-puppet-stuff',
file { '/etc/cron.d/dsa-boot-geodnssync': ensure => absent; }
concat::fragment { 'dsa-puppet-stuff--geodns-boot':
target => '/etc/cron.d/dsa-puppet-stuff',
@@
-63,4
+54,10
@@
class named::geodns inherits named {
@reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null
| EOF
}
@reboot geodnssync sleep 1m && /etc/bind/geodns/trigger > /dev/null
| EOF
}
+
+ ferm::rule { '01-dsa-bind':
+ domain => '(ip ip6)',
+ description => 'Allow nameserver access',
+ rule => '&TCP_UDP_SERVICE(53)'
+ }
}
}