X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=775878068c87c0c3fdb072e0ef8cfe92ea106a29;hb=419e3fe1fad8668d50e9c2dca72168b6c4e8c7aa;hp=14fc36403d61b5e71d30f76f17580447457db538;hpb=84d1e7a9c1728b78c3bca11e8a5505222c3b74ac;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 14fc36403..775878068 100644 --- a/modules/named/templates/named.conf.puppet-shared-keys.erb +++ b/modules/named/templates/named.conf.puppet-shared-keys.erb @@ -8,23 +8,24 @@ pairs = [ [ 'denis.debian.org', 'geo1.debian.org' ], [ 'denis.debian.org', 'geo2.debian.org' ], - [ 'denis.debian.org', 'geo3.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 = scope.function_hkdf(['/etc/puppet/secret', "puppet-key-#{keyname}"]) lines << "key #{keyname} { algorithm hmac-sha256; secret \"#{key}\"; };" - remote_ip = scope.lookupvar('site::allnodeinfo')[other]['ipHostNumber'] + remote_ip = scope.lookupvar('deprecated::allnodeinfo')[other]['ipHostNumber'] remote_ip.each do |r| lines << "server #{r} { keys { #{keyname}; }; };" end