X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-master-authorized_keys.erb;h=6f04c69f4623c3028b85dd5c23db44a32f7d6e7b;hb=69ddda6f521d4ef4ccc9d0fc551d512c0c7641f0;hp=9d01eef2ff0b0eba41916c3c9570b40ebc89f57d;hpb=3693942d822dc7a6428525a84d994d5338a34fc0;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb b/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb index 9d01eef2f..6f04c69f4 100644 --- a/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb +++ b/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb @@ -13,14 +13,18 @@ def getstaticsynckey(host) return key end +localinfo = scope.lookupvar('site::localinfo') +allnodeinfo = scope.lookupvar('site::allnodeinfo') + mirrors = [] -scope.lookupvar('site::localinfo').keys.sort.each do |node| - if scope.lookupvar('site::localinfo')[node]['static_mirror'] or scope.lookupvar('site::localinfo')[node]['static_source'] +localinfo.keys.sort.each do |node| + if localinfo[node]['static_mirror'] or localinfo[node]['static_source'] key = getstaticsynckey(node) - mirrors << { 'node' => node, 'addr' => scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'], 'key' => key} + mirrors << { 'node' => node, 'addr' => allnodeinfo[node]['ipHostNumber'], 'key' => key} end end +mirrors << { 'node' => 'wagner.debian.org', 'addr' => allnodeinfo['wagner.debian.org']['ipHostNumber'], 'key' => 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXHFIkIhOC5iDa0d0IN5w6tUUL2T2iXCYcS2+dandE9f550OpKQ/evUZhw4EERNYDA3G7GV3jJzQR0j/KZWJUtDCichmqS94xJqXURmZVNeLXWY9x/N7CB1iG1Iblu6sgyTUrs7N6Wb0fUab3AXAi9KIXdwNLY622reR9T//bRULPVIl5VFpYtGBPT9n3wR7fLQ4ndEcUmEGcM4jRbpLmye4QGgJotuzeBWUpX+U648Yly6U7NlAJIWPUt7hEzMz2AC81SLhGCwTk6sb19n2dO6WN2ndynp8PLG1emtgd1/DaeaRyPcitoWgSoDNgKNk3zLIDtCdSYvFI8xXrm6cK3 staticsync@wagner'} lines = [] for m in mirrors: