From de168787833dddc604663b6ee79e7abdaf158737 Mon Sep 17 00:00:00 2001 From: Luca Filipozzi Date: Sat, 8 Mar 2014 21:58:00 +0000 Subject: [PATCH] undo all easydns changes... if we are to hard code, put in another file --- .../named.conf.puppet-shared-keys.erb | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/modules/named/templates/named.conf.puppet-shared-keys.erb b/modules/named/templates/named.conf.puppet-shared-keys.erb index 33afad60..ab9c65d5 100644 --- a/modules/named/templates/named.conf.puppet-shared-keys.erb +++ b/modules/named/templates/named.conf.puppet-shared-keys.erb @@ -9,8 +9,7 @@ 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', 'orff.debian.org' ] ] lines = [] @@ -18,22 +17,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 -- 2.39.2