From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 29 May 2013 09:45:01 +0000 (+0000)
Subject: puppetmaster -> wheezy, Pt II
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=25bb434cd618144033442ae5e3404c5c7b03ec3d;p=mirror%2Fdsa-puppet.git

puppetmaster -> wheezy, Pt II
---

diff --git a/modules/porterbox/templates/default-mirror.erb b/modules/porterbox/templates/default-mirror.erb
index aa76940e3..a5822f9a4 100644
--- a/modules/porterbox/templates/default-mirror.erb
+++ b/modules/porterbox/templates/default-mirror.erb
@@ -1,6 +1,6 @@
 <%=
 ninfo = scope.lookupvar('site::nodeinfo')
-if ninfo['hoster'].has_key?('mirror-debian'):
+if ninfo['hoster'].has_key?('mirror-debian') then
     ninfo['hoster']['mirror-debian']
 else
     'http://cdn.debian.net/debian'
diff --git a/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb b/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
index 4ed90237c..fa188acb0 100644
--- a/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
+++ b/modules/roles/templates/static-mirroring/staticsync-authorized_keys.erb
@@ -27,7 +27,7 @@ end
 callers << { '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 callers:
+for m in callers do
     lines << '# ' + m['node']
     if m['key'].nil?
         lines << "# no key for node"