Merge branch '17635-pysdk-collection-preserve-version' into main. Closes #17635

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

diff --git a/lib/config/export.go b/lib/config/export.go
index 2a3d0e173a6d23d36474a55627f6cf73b758df4e..4c4e341f5a34c8608e554f407aab4869da88a8f6 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -72,6 +72,7 @@ var whitelist = map[string]bool{
        "API.MaxTokenLifetime":                                false,
        "API.RequestTimeout":                                  true,
        "API.SendTimeout":                                     true,
+       "API.VocabularyPath":                                  false,
        "API.WebsocketClientEventQueue":                       false,
        "API.WebsocketServerEventQueue":                       false,
        "AuditLogs":                                           false,
@@ -95,7 +96,7 @@ var whitelist = map[string]bool{
        "Collections.BlobTrashCheckInterval":                  false,
        "Collections.BlobTrashConcurrency":                    false,
        "Collections.BlobTrashLifetime":                       false,
-       "Collections.CollectionVersioning":                    false,
+       "Collections.CollectionVersioning":                    true,
        "Collections.DefaultReplication":                      true,
        "Collections.DefaultTrashLifetime":                    true,
        "Collections.ForwardSlashNameSubstitution":            true,
@@ -105,7 +106,7 @@ var whitelist = map[string]bool{
        "Collections.PreserveVersionIfIdle":                   true,
        "Collections.S3FolderObjects":                         true,
        "Collections.TrashSweepInterval":                      false,
-       "Collections.TrustAllContent":                         false,
+       "Collections.TrustAllContent":                         true,
        "Collections.WebDAVCache":                             false,
        "Collections.KeepproxyPermission":                     false,
        "Collections.WebDAVPermission":                        false,
@@ -119,6 +120,8 @@ var whitelist = map[string]bool{
        "Containers.JobsAPI":                                  true,
        "Containers.JobsAPI.Enable":                           true,
        "Containers.JobsAPI.GitInternalDir":                   false,
+       "Containers.LocalKeepBlobBuffersPerVCPU":              false,
+       "Containers.LocalKeepLogsToContainerLog":              false,
        "Containers.Logging":                                  false,
        "Containers.LogReuseDecisions":                        false,
        "Containers.LSF":                                      false,
@@ -213,6 +216,7 @@ var whitelist = map[string]bool{
        "SystemRootToken":                                     false,
        "TLS":                                                 false,
        "Users":                                               true,
+       "Users.ActivatedUsersAreVisibleToOthers":              false,
        "Users.AdminNotifierEmailFrom":                        false,
        "Users.AnonymousUserToken":                            true,
        "Users.AutoAdminFirstUser":                            false,
@@ -227,6 +231,7 @@ var whitelist = map[string]bool{
        "Users.NewUsersAreActive":                             false,
        "Users.PreferDomainForUsername":                       false,
        "Users.UserNotifierEmailFrom":                         false,
+       "Users.UserNotifierEmailBcc":                          false,
        "Users.UserProfileNotificationAddress":                false,
        "Users.UserSetupMailText":                             false,
        "Volumes":                                             true,
@@ -273,7 +278,6 @@ var whitelist = map[string]bool{
        "Workbench.UserProfileFormFields.*.*":                 true,
        "Workbench.UserProfileFormFields.*.*.*":               true,
        "Workbench.UserProfileFormMessage":                    true,
-       "Workbench.VocabularyURL":                             true,
        "Workbench.WelcomePageHTML":                           true,
 }