X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=5629427734aecce388c8417c62f36824a3ddb50e;hb=fe40a51bd33f4617c6f69c42efa81dd0a8c253c6;hp=07172b1f64d39d680db3131d601abf069beecf4c;hpb=7e22696fbb4b41c03143532a9676aae6749329e0;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 07172b1f6..562942773 100644
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -6,28 +6,28 @@
 <%=
 
 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', '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!
 	keyname = "tsig-#{pair.join('-')}"
-	pair.delete(fqdn)
+	pair.delete(@fqdn)
 	other = pair[0]
 
-	key = hkdf('/etc/puppet/secret', "puppet-key-#{keyname}")
+	key = scope.function_hkdf(['/etc/puppet/secret', "puppet-key-#{keyname}"])
 
-	lines << "key #{keyname} { algorithm hmac-md5; secret \"#{key}\"; };\n"
+	lines << "key #{keyname} { algorithm hmac-sha256; secret \"#{key}\"; };"
 
 	remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber']
 	remote_ip.each do |r|
-		lines << "server #{r} { keys { #{keyname}; }; };\n"
+		lines << "server #{r} { keys { #{keyname}; }; };"
 	end
 	lines << ""
 end