]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
only hostname, not fqdn
authorPeter Palfrader <peter@palfrader.org>
Sat, 14 Feb 2015 14:18:21 +0000 (15:18 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 14 Feb 2015 14:18:21 +0000 (15:18 +0100)
modules/roles/templates/buildd_master_wb-authorized_keys.erb

index e57904e8dabf0c1493da58056fb950891de57faa..1b1759576455209150f1c65dee300096c86ccb5d 100644 (file)
@@ -27,9 +27,9 @@ lines = []
 for m in buildds do
   lines << '# ' + m['node']
   if m['key'].nil?
-    lines << "# no key for node"
+    lines << "## no key for node"
   else
-    lines << "command=\"/srv/wanna-build/bin/wanna-build --ssh-wrapper #{m['node']}\"," +
+    lines << "command=\"/srv/wanna-build/bin/wanna-build --ssh-wrapper #{m['node'].split('.')[0]}\"," +
              'no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,' +
              'from="' + m['addr'].join(',') + '" ' +
              m['key']