purging orff

[dsa-puppet.git] / modules / named / templates / named.conf.puppet-shared-keys.erb

diff --git a/modules/named/templates/named.conf.puppet-shared-keys.erb b/modules/named/templates/named.conf.puppet-shared-keys.erb
index 33afad60923e143ee0323f25d68fcb1c9ee7e050..14fc36403d61b5e71d30f76f17580447457db538 100644 (file)
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -6,11 +6,9 @@
 <%=
 
 pairs = [
-       [ 'denis.debian.org', 'ravel.debian.org' ],
-       [ 'denis.debian.org', 'senfl.debian.org' ],
-       [ 'denis.debian.org', 'diamond.debian.org' ],
-       [ 'denis.debian.org', 'orff.debian.org' ],
-       [ 'denis.debian.org', 'xfr0.easydns.com' ]
+       [ 'denis.debian.org', 'geo1.debian.org' ],
+       [ 'denis.debian.org', 'geo2.debian.org' ],
+       [ 'denis.debian.org', 'geo3.debian.org' ]
        ]
 
 lines = []
@@ -18,22 +16,15 @@ lines = []
 pairs.each do |pair|
        next unless pair.include?(fqdn)
        pair.sort!
+       keyname = "tsig-#{pair.join('-')}"
        pair.delete(fqdn)
        other = pair[0]
 
-       if other == 'xfr0.easydns.com'
-               remote_ip = ['64.68.200.91']
-               algorithm = "hmac-md5";
-               keyname = "82.195.75.91-key"
-               key = "VoIkCnR5DaI3QP3xtmdCYg=="
-       else
-               remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber']
-               algorithm = "hmac-sha256";
-               keyname = "tsig-#{pair.join('-')}"
-               key = scope.function_hkdf(['/etc/puppet/secret', "puppet-key-#{keyname}"])
-       end
+       key = scope.function_hkdf(['/etc/puppet/secret', "puppet-key-#{keyname}"])
+
+       lines << "key #{keyname} { algorithm hmac-sha256; secret \"#{key}\"; };"
 
-       lines << "key #{keyname} { algorithm #{algorithm}; secret \"#{key}\"; };"
+       remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber']
        remote_ip.each do |r|
                lines << "server #{r} { keys { #{keyname}; }; };"
        end