X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.puppet-shared-keys.erb;h=7cbc0041b136faa83c07f2b044e5311541a06032;hb=4ea1c460a6197c4ab24ad77df64ea15acd6ba797;hp=054b2f32284826be599ce723e766ce2f084baffd;hpb=3c5cd79c007e20060d4cf8b084669657f4e13cbc;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 054b2f322..7cbc0041b 100644 --- a/modules/named/templates/named.conf.puppet-shared-keys.erb +++ b/modules/named/templates/named.conf.puppet-shared-keys.erb @@ -6,9 +6,6 @@ <%= pairs = [ - [ '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' ] @@ -17,10 +14,10 @@ pairs = [ 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}"])