Should we add here a link to the gitolite doc mentioning this?

Sure.
For my reference: http://gitolite.com/gitolite/basic-admin.html#multi-key

Is there not an indentation issue with the if above?

What about existing keys in keydir/<user>.pub ?

No, this is exactly four spaces more indented then the if above.
Though I do agree with you that that gets lost in the web view :).

Indeed keeping the mouse straight, it looks good :)

I was assuming we would just clear them out before, and I need to create a function to call this function for every user we have so that that works.
That way, we can just regenerate all keyfiles, and then just manually do keydir/*.pub.

But if you want to, I can also make it remove those files itself.

Should we change the button above to mention ACL and authorized_key ?

(Though we have borked files already: the ones with a \n in them, so just cleaning and regenerating them all might be best).

Ok, wfm then (with the utility method in the admin section to regenerate all the <user>.pub files)

We may want a .encode('UTF-8') here to account for keys having non-ascii characters

@puiterwijk

Are you planning on adding the utility method discussed above to this PR or to a later one?

Also: Could you rebase your branch?

Thanks

@puiterwijk, could you follow up on this? It's been sitting in the queue for almost a month. Would be nice to wrap it up.

left over or it was missing?

I guess we can remove this one now :)

Is this ever going to do something? In this case if ssh_key != user.public_ssh_key: in that function will always return False, so we should either adjust or just drop this call.

From my tests this seems to be working fine, we'll just have to be careful when we deploy the next version in stg.