projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove temporary DC19 rules for roles::sreview
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
keyring.pp
diff --git
a/modules/roles/manifests/keyring.pp
b/modules/roles/manifests/keyring.pp
index
a1d40e2
..
25ab9d3
100644
(file)
--- a/
modules/roles/manifests/keyring.pp
+++ b/
modules/roles/manifests/keyring.pp
@@
-12,13
+12,12
@@
class roles::keyring {
include named::authoritative
include named::authoritative
- $notify_address = join(getfromhash($site::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), " ")
$notify_address_bind = join(getfromhash($site::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
$notify_address_bind = join(getfromhash($site::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
-
@
ferm::rule { '01-dsa-bind':
+ ferm::rule { '01-dsa-bind':
domain => '(ip ip6)',
description => 'Allow nameserver access',
domain => '(ip ip6)',
description => 'Allow nameserver access',
- rule =>
"\&TCP_UDP_SERVICE_RANGE(53, ( $HOST_NAGIOS $notify_address ) )"
,
+ rule =>
'&TCP_UDP_SERVICE_RANGE(53, ( $HOST_NAGIOS $HOST_DNSPRIMARY ) )'
,
}
concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':
}
concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':