From 3a5787e348233c594b3251979ff2d1717e82d295 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 30 Dec 2013 21:46:47 +0000 Subject: [PATCH] fix named.conf.puppet-shared-keys --- modules/named/templates/named.conf.puppet-shared-keys.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.39.2