X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=5629427734aecce388c8417c62f36824a3ddb50e;hb=22650212548428f584a91e909c813e4f64e13860;hp=33afad60923e143ee0323f25d68fcb1c9ee7e050;hpb=442aca53e90777515bf6ede3cb4294f924c9cf0f;p=mirror%2Fdsa-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 33afad609..562942773 100644
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -6,34 +6,26 @@
 <%=
 
 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' ],
+	[ 'denis.debian.org', 'kaufmann.debian.org' ],
 	]
 
 lines = []
 
 pairs.each do |pair|
-	next unless pair.include?(fqdn)
+	next unless pair.include?(@fqdn)
 	pair.sort!
-	pair.delete(fqdn)
+	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