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=ced18346fc5d9596f6402f62273adad5b7212c88;hp=e41e4aab175655e9b3646499e99ded60486bd523;hpb=5d388b310d95f0209c5d7376515e94b2774a400c;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 e41e4aab1..7cbc0041b 100644 --- a/modules/named/templates/named.conf.puppet-shared-keys.erb +++ b/modules/named/templates/named.conf.puppet-shared-keys.erb @@ -6,20 +6,18 @@ <%= 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', 'xfr0.easydns.com' ] + [ 'denis.debian.org', 'geo1.debian.org' ], + [ 'denis.debian.org', 'geo2.debian.org' ], + [ 'denis.debian.org', 'geo3.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}"])