projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "try to get node names this way"
[mirror/dsa-puppet.git]
/
modules
/
unbound
/
manifests
/
init.pp
diff --git
a/modules/unbound/manifests/init.pp
b/modules/unbound/manifests/init.pp
index
587b19b
..
3a0eeb3
100644
(file)
--- a/
modules/unbound/manifests/init.pp
+++ b/
modules/unbound/manifests/init.pp
@@
-9,8
+9,8
@@
class unbound {
$is_recursor = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
class unbound {
$is_recursor = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
- $client_ranges =
getfromhash($site::nodeinfo, 'hoster',
'allow_dns_query')
- $
dodgy_ns = getfromhash($site::nodeinfo, 'hoster', 'nameservers_break_dnssec'
)
+ $client_ranges =
hiera(
'allow_dns_query')
+ $
empty_client_range = empty($client_ranges
)
$ns = hiera('nameservers')
package { 'unbound':
$ns = hiera('nameservers')
package { 'unbound':
@@
-46,6
+46,14
@@
class unbound {
mode => '0644',
source => 'puppet:///modules/unbound/debian.org.key'
}
mode => '0644',
source => 'puppet:///modules/unbound/debian.org.key'
}
+ file { '/var/lib/unbound/29.172.in-addr.arpa.key':
+ ensure => present,
+ replace => false,
+ owner => unbound,
+ group => unbound,
+ mode => '0644',
+ source => 'puppet:///modules/unbound/29.172.in-addr.arpa.key'
+ }
file { '/etc/unbound/unbound.conf':
content => template('unbound/unbound.conf.erb'),
require => [
file { '/etc/unbound/unbound.conf':
content => template('unbound/unbound.conf.erb'),
require => [
@@
-56,16
+64,16
@@
class unbound {
notify => Service['unbound']
}
notify => Service['unbound']
}
- if ($is_recursor and
$client_ranges) {
+ if ($is_recursor and
!$empty_client_range) {
@ferm::rule { 'dsa-dns':
domain => 'ip',
description => 'Allow nameserver access',
@ferm::rule { 'dsa-dns':
domain => 'ip',
description => 'Allow nameserver access',
- rule => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv4(
getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query')
))),
+ rule => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv4(
$client_ranges
))),
}
@ferm::rule { 'dsa-dns6':
domain => 'ip6',
description => 'Allow nameserver access',
}
@ferm::rule { 'dsa-dns6':
domain => 'ip6',
description => 'Allow nameserver access',
- rule => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv6(
getfromhash($site::nodeinfo, 'hoster', 'allow_dns_query')
))),
+ rule => sprintf('&TCP_UDP_SERVICE_RANGE(53, (%s))', join_spc(filter_ipv6(
$client_ranges
))),
}
}
}
}
}
}