projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror-anu must not be in apache2_www_mirror if it is in static
[mirror/dsa-puppet.git]
/
modules
/
unbound
/
manifests
/
init.pp
diff --git
a/modules/unbound/manifests/init.pp
b/modules/unbound/manifests/init.pp
index
08f3e4a
..
667abc1
100644
(file)
--- a/
modules/unbound/manifests/init.pp
+++ b/
modules/unbound/manifests/init.pp
@@
-10,6
+10,7
@@
class unbound {
$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')
+ $empty_client_range = empty($client_ranges)
$ns = hiera('nameservers')
package { 'unbound':
$ns = hiera('nameservers')
package { 'unbound':
@@
-22,6
+23,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,
@@
-45,6
+51,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 => [
@@
-55,7
+69,7
@@
class unbound {
notify => Service['unbound']
}
notify => Service['unbound']
}
- if ($is_recursor and
not $client_ranges.empty?) {
+ 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',