From: Peter Palfrader Date: Sat, 14 Feb 2015 14:18:21 +0000 (+0100) Subject: only hostname, not fqdn X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=013ce2108c8102a37dff50bc6891a59e0112a389;p=dsa-puppet.git only hostname, not fqdn --- diff --git a/modules/roles/templates/buildd_master_wb-authorized_keys.erb b/modules/roles/templates/buildd_master_wb-authorized_keys.erb index e57904e8..1b175957 100644 --- a/modules/roles/templates/buildd_master_wb-authorized_keys.erb +++ b/modules/roles/templates/buildd_master_wb-authorized_keys.erb @@ -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']