X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=33afad60923e143ee0323f25d68fcb1c9ee7e050;hb=442aca53e90777515bf6ede3cb4294f924c9cf0f;hp=e7f3722daa4eae5439e83b27a9c07478323d651e;hpb=3b3fe9d4613e203550327a8d62f079dc4ad34ca7;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..33afad60 100644
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -18,19 +18,22 @@ lines = []
 pairs.each do |pair|
 	next unless pair.include?(fqdn)
 	pair.sort!
-	keyname = "tsig-#{pair.join('-')}"
 	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";
+		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
+
+	lines << "key #{keyname} { algorithm #{algorithm}; secret \"#{key}\"; };"
 	remote_ip.each do |r|
 		lines << "server #{r} { keys { #{keyname}; }; };"
 	end