Merge branch 'master' into 15572-new-install-docs

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

diff --git a/lib/config/export.go b/lib/config/export.go
index cd58868ed105a6143205b79e21a47147360307cd..e7278c5f32b9a8de1c5d5ec3e47d0d4838813603 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -11,7 +11,7 @@ import (
        "io"
        "strings"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
+       "git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 // ExportJSON writes a JSON object with the safe (non-secret) portions
@@ -124,14 +124,17 @@ var whitelist = map[string]bool{
        "Containers.SupportedDockerImageFormats":       true,
        "Containers.SupportedDockerImageFormats.*":     true,
        "Containers.UsePreemptibleInstances":           true,
-       "EnableBetaController14287":                    false,
+       "ForceLegacyAPI14":                             false,
        "Git":                                          false,
        "InstanceTypes":                                true,
        "InstanceTypes.*":                              true,
        "InstanceTypes.*.*":                            true,
        "Login":                                        true,
-       "Login.ProviderAppSecret":                      false,
+       "Login.GoogleClientID":                         false,
+       "Login.GoogleClientSecret":                     false,
+       "Login.GoogleAlternateEmailAddresses":          false,
        "Login.ProviderAppID":                          false,
+       "Login.ProviderAppSecret":                      false,
        "Login.LoginCluster":                           true,
        "Login.RemoteTokenRefresh":                     true,
        "Mail":                                         false,
@@ -164,6 +167,7 @@ var whitelist = map[string]bool{
        "Users.NewInactiveUserNotificationRecipients":  false,
        "Users.NewUserNotificationRecipients":          false,
        "Users.NewUsersAreActive":                      false,
+       "Users.PreferDomainForUsername":                false,
        "Users.UserNotifierEmailFrom":                  false,
        "Users.UserProfileNotificationAddress":         false,
        "Volumes":                                      true,
@@ -208,6 +212,7 @@ var whitelist = map[string]bool{
        "Workbench.UserProfileFormMessage":             true,
        "Workbench.VocabularyURL":                      true,
        "Workbench.WelcomePageHTML":                    true,
+       "Workbench.InactivePageHTML":                   true,
 }
 
 func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {