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 74b3c1f..a411ff5 100644 (file)
--- a/modules/roles/manifests/keyring.pp
+++ b/modules/roles/manifests/keyring.pp
@@ -1,5 +1,5 @@
 class roles::keyring {
-       rsync::site_systemd { 'keyring':
+       rsync::site { 'keyring':
                source  => 'puppet:///modules/roles/keyring/rsyncd.conf',
                sslname => 'keyring.debian.org',
        }
@@ -9,4 +9,34 @@ class roles::keyring {
                key      => true,
                tlsaport => [443, 1873],
        }
+
+       include named::authoritative
+
+       $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 ) )',
+       }
+
+       concat::fragment { 'dsa-named-conf-puppet-misc---openpgpkey-zone':
+               target => '/etc/bind/named.conf.puppet-misc',
+               order  => '020',
+               content  => @("EOF"),
+                       zone "_openpgpkey.debian.org" {
+                               type master;
+                               file "/srv/keyring.debian.org/_openpgpkey.debian.org.zone";
+                               allow-query { any; };
+                               allow-transfer {
+                                       key tsig-denis.debian.org-kaufmann.debian.org ;
+                                       127.0.0.1;
+                               };
+                               also-notify {
+                                       $notify_address_bind;
+                               };
+                       };
+                       | EOF
+       }
+
 }