Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / roles / templates / ssh_upload_buildd-uploader-authorized_keys.erb

diff --git a/modules/roles/templates/ssh_upload_buildd-uploader-authorized_keys.erb b/modules/roles/templates/ssh_upload_buildd-uploader-authorized_keys.erb
index 8dccbfb..ad506d0 100644 (file)
--- a/modules/roles/templates/ssh_upload_buildd-uploader-authorized_keys.erb
+++ b/modules/roles/templates/ssh_upload_buildd-uploader-authorized_keys.erb
@@ -30,7 +30,7 @@ for m in buildds do
     lines << "## no key for node"
   else
     lines << "command=\"/home/buildd-uploader/rsync-ssh-wrap #{m['node'].split('.')[0]}\"," +
-             'no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-user-rc,' +
+             'restrict,' +
              'from="' + m['addr'].join(',') + '" ' +
              m['key']
   end