Try to avoid reserved site keyword

[mirror/dsa-puppet.git] / modules / roles / manifests / keyring.pp

diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
index 910b666..a411ff5 100644 (file)
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -12,9 +12,9 @@ class roles::keyring {
 
        include named::authoritative
 
-       $notify_address_bind = join(getfromhash($site::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
+       $notify_address_bind = join(getfromhash($deprecated::allnodeinfo, 'denis.debian.org', 'ipHostNumber'), "; ")
 
-       @ferm::rule { '01-dsa-bind':
+       ferm::rule { '01-dsa-bind':
                domain      => '(ip ip6)',
                description => 'Allow nameserver access',
                rule        => '&TCP_UDP_SERVICE_RANGE(53, ( $HOST_NAGIOS $HOST_DNSPRIMARY ) )',
@@ -24,7 +24,6 @@ class roles::keyring {
                target => '/etc/bind/named.conf.puppet-misc',
                order  => '020',
                content  => @("EOF"),
-                       // MAINTAIN-KEY: _openpgpkey.debian.org
                        zone "_openpgpkey.debian.org" {
                                type master;
                                file "/srv/keyring.debian.org/_openpgpkey.debian.org.zone";