X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;fp=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=e9f7022bbcfead0a00e76482aa57f031f38e4dbd;hb=3a5787e348233c594b3251979ff2d1717e82d295;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..e9f7022b 100644
--- a/modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/modules/named/templates/named.conf.puppet-shared-keys.erb
@@ -21,13 +21,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-md5; 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