X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=7cbc0041b136faa83c07f2b044e5311541a06032;hb=9bf11cb6ac1b88d10f2e1e1fdffb0406577e8125;hp=71cc4132199fe5164b544d2c0bc8607f9e57b766;hpb=03fbf64909fd0011aed135a5f31962c247e01be4;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 71cc41321..7cbc0041b 100644
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -6,31 +6,25 @@
 <%=
 
 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 = []
 
 pairs.each do |pair|
-	next unless pair.include?(fqdn)
+	next unless pair.include?(@fqdn)
 	pair.sort!
 	keyname = "tsig-#{pair.join('-')}"
-	pair.delete(fqdn)
+	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'
-	else
-		remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber']
-	end
+	remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber']
 	remote_ip.each do |r|
 		lines << "server #{r} { keys { #{keyname}; }; };"
 	end