15720: Merge branch 'master' into 15720-fed-user-list

[arvados.git] / lib / config / generated_config.go

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 42beb066344545f6faa2e9a1c30c6dc8b744578e..ece3a627fd6a5b7ed2fe5179068b6a10ba20439f 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -281,6 +281,12 @@ Clusters:
       # in the directory where your API server is running.
       AnonymousUserToken: ""
 
+      # If a new user has an alternate email address (local@domain)
+      # with the domain given here, its local part becomes the new
+      # user's default username. Otherwise, the user's primary email
+      # address is used.
+      PreferDomainForUsername: ""
+
     AuditLogs:
       # Time to keep audit logs, in seconds. (An audit log is a row added
       # to the "logs" table in the PostgreSQL database each time an
@@ -504,9 +510,11 @@ Clusters:
 
       # (Experimental) Authenticate with Google, bypassing the
       # SSO-provider gateway service. Use the Google Cloud console to
-      # generate the Client ID and secret (APIs and Services >
-      # Credentials > Create credentials > OAuth client ID > Web
-      # application) and add your controller's /login URL (e.g.,
+      # enable the People API (APIs and Services > Enable APIs and
+      # services > Google People API > Enable), generate a Client ID
+      # and secret (APIs and Services > Credentials > Create
+      # credentials > OAuth client ID > Web application) and add your
+      # controller's /login URL (e.g.,
       # "https://zzzzz.example.com/login") as an authorized redirect
       # URL.
       #
@@ -515,9 +523,15 @@ Clusters:
       GoogleClientID: ""
       GoogleClientSecret: ""
 
+      # Allow users to log in to existing accounts using any verified
+      # email address listed by their Google account. If true, the
+      # Google People API must be enabled in order for Google login to
+      # work. If false, only the primary email address will be used.
+      GoogleAlternateEmailAddresses: true
+
       # The cluster ID to delegate the user database.  When set,
       # logins on this cluster will be redirected to the login cluster
-      # (login cluster must appear in RemoteHosts with Proxy: true)
+      # (login cluster must appear in RemoteClusters with Proxy: true)
       LoginCluster: ""
 
       # How long a cached token belonging to a remote cluster will