X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=c9e68368b0bedbabf8a5f654e7edae073426529c;hb=49c6cbaa656966a0f00c637591fdab1908c0c38b;hp=e7f3722daa4eae5439e83b27a9c07478323d651e;hpb=9fc6b50a77addc33917b107274289ec87db15d47;p=dsa-puppet.git diff --git a/modules/named/templates/named.conf.puppet-shared-keys.erb b/modules/named/templates/named.conf.puppet-shared-keys.erb index e7f3722d..c9e68368 100644 --- a/modules/named/templates/named.conf.puppet-shared-keys.erb +++ b/modules/named/templates/named.conf.puppet-shared-keys.erb @@ -22,15 +22,16 @@ pairs.each do |pair| pair.delete(fqdn) other = pair[0] - key = scope.function_hkdf(['/etc/puppet/secret', "puppet-key-#{keyname}"]) - - lines << "key #{keyname} { algorithm hmac-sha256; secret \"#{key}\"; };" - if other == 'xfr0.easydns.com' remote_ip = ['64.68.200.91'] + algorithm = "hmac-md5"; else remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber'] + algorithm = "hmac-sha256"; end + + key = scope.function_hkdf(['/etc/puppet/secret', "puppet-key-#{keyname}"]) + lines << "key #{keyname} { algorithm #{algorithm}; secret \"#{key}\"; };" remote_ip.each do |r| lines << "server #{r} { keys { #{keyname}; }; };" end