projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix previous commit
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
keyring.pp
diff --git
a/modules/roles/manifests/keyring.pp
b/modules/roles/manifests/keyring.pp
index
453e6c0
..
cbdee86
100644
(file)
--- a/
modules/roles/manifests/keyring.pp
+++ b/
modules/roles/manifests/keyring.pp
@@
-16,11
+16,7
@@
class roles::keyring {
$notify_address_bind = join(getfromhash($deprecated::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), '; ')
$notify_address_bind = join(getfromhash($deprecated::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), '; ')
- ferm::rule { '01-dsa-bind':
- domain => '(ip ip6)',
- description => 'Allow nameserver access',
- rule => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_NAGIOS $HOST_DNSPRIMARY ) )',
- }
+ Ferm::Rule::Simple <<| tag == 'named::keyring::ferm' |>>
concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':
target => '/etc/bind/named.conf.puppet-misc',
concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':
target => '/etc/bind/named.conf.puppet-misc',