X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=14fc36403d61b5e71d30f76f17580447457db538;hb=84d1e7a9c1728b78c3bca11e8a5505222c3b74ac;hp=07172b1f64d39d680db3131d601abf069beecf4c;hpb=7e22696fbb4b41c03143532a9676aae6749329e0;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 07172b1f..14fc3640 100644
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -6,10 +6,9 @@
 <%=
 
 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' ]
 	]
 
 lines = []
@@ -21,13 +20,13 @@ pairs.each do |pair|
 	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