19973: Merge branch 'main'

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

diff --git a/lib/config/export.go b/lib/config/export.go
index 56090afec9fa06a659d703481241c227d2f2b3cc..a8a535eeb58540799be38e7a8fc852ad0c0552fe 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -65,6 +65,7 @@ var whitelist = map[string]bool{
        "API.FreezeProjectRequiresDescription":     true,
        "API.FreezeProjectRequiresProperties":      true,
        "API.FreezeProjectRequiresProperties.*":    true,
+       "API.LockBeforeUpdate":                     false,
        "API.KeepServiceRequestTimeout":            false,
        "API.MaxConcurrentRequests":                false,
        "API.MaxIndexDatabaseRead":                 false,
@@ -130,7 +131,6 @@ var whitelist = map[string]bool{
        "Containers.Logging":                       false,
        "Containers.LogReuseDecisions":             false,
        "Containers.LSF":                           false,
-       "Containers.MaxComputeVMs":                 false,
        "Containers.MaxDispatchAttempts":           false,
        "Containers.MaxRetryAttempts":              true,
        "Containers.MinRetryPeriod":                true,
@@ -162,6 +162,7 @@ var whitelist = map[string]bool{
        "Login.LDAP.EmailAttribute":                           false,
        "Login.LDAP.Enable":                                   true,
        "Login.LDAP.InsecureTLS":                              false,
+       "Login.LDAP.MinTLSVersion":                            false,
        "Login.LDAP.SearchAttribute":                          false,
        "Login.LDAP.SearchBase":                               false,
        "Login.LDAP.SearchBindPassword":                       false,
@@ -193,6 +194,7 @@ var whitelist = map[string]bool{
        "Login.Test.Users":                                    false,
        "Login.TokenLifetime":                                 false,
        "Login.TrustedClients":                                false,
+       "Login.TrustPrivateNetworks":                          false,
        "Mail":                                                true,
        "Mail.EmailFrom":                                      false,
        "Mail.IssueReporterEmailFrom":                         false,
@@ -214,7 +216,6 @@ var whitelist = map[string]bool{
        "Services.*":                                          true,
        "Services.*.ExternalURL":                              true,
        "Services.*.InternalURLs":                             false,
-       "Services.*.ListenAddress":                            false,
        "StorageClasses":                                      true,
        "StorageClasses.*":                                    true,
        "StorageClasses.*.Default":                            true,
@@ -227,6 +228,7 @@ var whitelist = map[string]bool{
        "TLS.Key":                                             false,
        "Users":                                               true,
        "Users.ActivatedUsersAreVisibleToOthers":              false,
+       "Users.ActivityLoggingPeriod":                         false,
        "Users.AdminNotifierEmailFrom":                        false,
        "Users.AnonymousUserToken":                            true,
        "Users.AutoAdminFirstUser":                            false,
@@ -235,6 +237,7 @@ var whitelist = map[string]bool{
        "Users.AutoSetupNewUsersWithRepository":               false,
        "Users.AutoSetupNewUsersWithVmUUID":                   false,
        "Users.AutoSetupUsernameBlacklist":                    false,
+       "Users.CanCreateRoleGroups":                           true,
        "Users.EmailSubjectPrefix":                            false,
        "Users.NewInactiveUserNotificationRecipients":         false,
        "Users.NewUserNotificationRecipients":                 false,
@@ -264,6 +267,7 @@ var whitelist = map[string]bool{
        "Workbench.ApplicationMimetypesWithViewIcon.*":        true,
        "Workbench.ArvadosDocsite":                            true,
        "Workbench.ArvadosPublicDataDocURL":                   true,
+       "Workbench.BannerUUID":                                true,
        "Workbench.DefaultOpenIdPrefix":                       false,
        "Workbench.DisableSharingURLsUI":                      true,
        "Workbench.EnableGettingStartedPopup":                 true,