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 "Ignore qemu-efi-arm on ubc-node-arm0X"
[mirror/dsa-puppet.git]
/
modules
/
unbound
/
manifests
/
init.pp
diff --git
a/modules/unbound/manifests/init.pp
b/modules/unbound/manifests/init.pp
index
3a0eeb3
..
0d24653
100644
(file)
--- a/
modules/unbound/manifests/init.pp
+++ b/
modules/unbound/manifests/init.pp
@@
-7,9
+7,11
@@
# include unbound
#
class unbound {
# include unbound
#
class unbound {
+ include stdlib
$is_recursor = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
$client_ranges = hiera('allow_dns_query')
$is_recursor = getfromhash($site::nodeinfo, 'misc', 'resolver-recursive')
$client_ranges = hiera('allow_dns_query')
+ $firewall_blocks_dns = hiera('firewall_blocks_dns', false)
$empty_client_range = empty($client_ranges)
$ns = hiera('nameservers')
$empty_client_range = empty($client_ranges)
$ns = hiera('nameservers')
@@
-23,6
+25,11
@@
class unbound {
pattern => 'unbound',
}
pattern => 'unbound',
}
+ file { '/etc/init.d/unbound':
+ source => 'puppet:///modules/unbound/unbound.init',
+ mode => '0555',
+ notify => Exec['systemctl daemon-reload'],
+ }
file { '/var/lib/unbound':
ensure => directory,
owner => unbound,
file { '/var/lib/unbound':
ensure => directory,
owner => unbound,
@@
-36,7
+43,8
@@
class unbound {
owner => unbound,
group => unbound,
mode => '0644',
owner => unbound,
group => unbound,
mode => '0644',
- source => 'puppet:///modules/unbound/root.key'
+ source => 'puppet:///modules/unbound/root.key',
+ notify => Service['unbound']
}
file { '/var/lib/unbound/debian.org.key':
ensure => present,
}
file { '/var/lib/unbound/debian.org.key':
ensure => present,
@@
-44,15
+52,17
@@
class unbound {
owner => unbound,
group => unbound,
mode => '0644',
owner => unbound,
group => unbound,
mode => '0644',
- source => 'puppet:///modules/unbound/debian.org.key'
+ source => 'puppet:///modules/unbound/debian.org.key',
+ notify => Service['unbound']
}
file { '/var/lib/unbound/29.172.in-addr.arpa.key':
}
file { '/var/lib/unbound/29.172.in-addr.arpa.key':
- ensure =>
present
,
- replace =>
false
,
+ ensure =>
$firewall_blocks_dns ? { true => 'absent', default => 'present' }
,
+ replace =>
$firewall_blocks_dns ? { true => true, default => false }
,
owner => unbound,
group => unbound,
mode => '0644',
owner => unbound,
group => unbound,
mode => '0644',
- source => 'puppet:///modules/unbound/29.172.in-addr.arpa.key'
+ source => 'puppet:///modules/unbound/29.172.in-addr.arpa.key',
+ notify => Service['unbound']
}
file { '/etc/unbound/unbound.conf':
content => template('unbound/unbound.conf.erb'),
}
file { '/etc/unbound/unbound.conf':
content => template('unbound/unbound.conf.erb'),