projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Parameterize webserver class
[mirror/dsa-puppet.git]
/
modules
/
named
/
templates
/
named.conf.puppet-shared-keys.erb
diff --git
a/modules/named/templates/named.conf.puppet-shared-keys.erb
b/modules/named/templates/named.conf.puppet-shared-keys.erb
index
8027c89
..
7758780
100644
(file)
--- a/
modules/named/templates/named.conf.puppet-shared-keys.erb
+++ b/
modules/named/templates/named.conf.puppet-shared-keys.erb
@@
-6,27
+6,26
@@
<%=
pairs = [
<%=
pairs = [
- [ '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', '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|
]
lines = []
pairs.each do |pair|
- next unless pair.include?(fqdn)
+ next unless pair.include?(
@
fqdn)
pair.sort!
keyname = "tsig-#{pair.join('-')}"
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}\"; };"
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
remote_ip.each do |r|
lines << "server #{r} { keys { #{keyname}; }; };"
end