17170: Merge branch 'master'

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

diff --git a/lib/config/export.go b/lib/config/export.go
index b203dff26a1b80272be29f41dd747c8108beb272..2d666e638bea225d5ec1f4e1dc974a6695481494 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -69,7 +69,6 @@ var whitelist = map[string]bool{
        "API.MaxKeepBlobBuffers":                       false,
        "API.MaxRequestAmplification":                  false,
        "API.MaxRequestSize":                           true,
-       "API.RailsSessionSecretToken":                  false,
        "API.RequestTimeout":                           true,
        "API.SendTimeout":                              true,
        "API.WebsocketClientEventQueue":                false,
@@ -122,6 +121,9 @@ var whitelist = map[string]bool{
        "Containers.MaxRetryAttempts":                  true,
        "Containers.MinRetryPeriod":                    true,
        "Containers.ReserveExtraRAM":                   true,
+       "Containers.ShellAccess":                       true,
+       "Containers.ShellAccess.Admin":                 true,
+       "Containers.ShellAccess.User":                  true,
        "Containers.SLURM":                             false,
        "Containers.StaleLockTimeout":                  false,
        "Containers.SupportedDockerImageFormats":       true,
@@ -174,6 +176,7 @@ var whitelist = map[string]bool{
        "Login.Test.Enable":                            true,
        "Login.Test.Users":                             false,
        "Login.TokenLifetime":                          false,
+       "Login.TrustedClients":                         false,
        "Mail":                                         true,
        "Mail.EmailFrom":                               false,
        "Mail.IssueReporterEmailFrom":                  false,
@@ -214,6 +217,7 @@ var whitelist = map[string]bool{
        "Users.PreferDomainForUsername":                false,
        "Users.UserNotifierEmailFrom":                  false,
        "Users.UserProfileNotificationAddress":         false,
+       "Users.UserSetupMailText":                      false,
        "Volumes":                                      true,
        "Volumes.*":                                    true,
        "Volumes.*.*":                                  false,
@@ -237,6 +241,7 @@ var whitelist = map[string]bool{
        "Workbench.EnableGettingStartedPopup":          true,
        "Workbench.EnablePublicProjectsPage":           true,
        "Workbench.FileViewersConfigURL":               true,
+       "Workbench.IdleTimeout":                        true,
        "Workbench.InactivePageHTML":                   true,
        "Workbench.LogViewerMaxBytes":                  true,
        "Workbench.MultiSiteSearch":                    true,