From 3c0eaef5001ec155ad2f379e12440d822300dc13 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Wed, 27 May 2020 04:43:31 +0200 Subject: logerrit: Don't suggest to set oneself a username. Usernames (used for HTTP and SSH authentication) are now automatically provisioned from SSO (along with the primary email address and display name). Username/email collisions are fatal and need manual resolution, but for most users the registration step should be somewhat simpler. Also, update the documentation to reflect /settings/#SSHKeys from gerrit 3.0's UI. Change-Id: Ia634c2f92f42b4b698543d990534ac15215a4c96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94931 Reviewed-by: Guilhem Moulin Tested-by: Jenkins --- logerrit | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/logerrit b/logerrit index 86f39cef99ab..a4a987817369 100755 --- a/logerrit +++ b/logerrit @@ -96,22 +96,25 @@ case "$1" in fi done fi - echo "Please go to https://gerrit.libreoffice.org/ and:" - echo " - press the 'register' button in the top right corner" - echo " - after login set yourself a username (it is recommended to use your IRC-nick)" - if test -z "$ssh_key"; then - echo " - add your public ssh-key into the ssh keys settings." + echo "Please go to https://gerrit.libreoffice.org/ and click the \"Sign in\" link" + echo "at the top right of the page. You'll be sent to our Single Sign-On portal" + echo "for authentication (create an account if needs be), and automatically" + echo "redirected back to gerrit afterwards." + echo + echo "Visit https://gerrit.libreoffice.org/settings/#SSHKeys and paste the public" + if test -z "$ssh_key"; then + echo "part of your SSH key in the 'New SSH key' form." else - echo " - paste the key below into the 'Add SSH Public Key' box." + echo "key below in the 'New SSH key' form." echo printf '%s\n' "$ssh_key" echo - fi - echo - echo "Note that you need to register additional email addresses, if you want to" - echo "commit from them. Additional emails must be confirmed by replying to the" - echo "invitation mail it sends you." - echo + fi + echo + echo "Note that you need to register additional email addresses, if you want to" + echo "commit from them. Each additional email address must be confirmed by" + echo "following the verification link sent to it." + echo read -r -p 'Which user name did you choose? ' GERRITUSER if test -z "$created_ssh"; then echo -- cgit v1.2.3