Merge branch '19624-priority-doc'

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

diff --git a/lib/config/export.go b/lib/config/export.go
index 814fc6cd9b9dfc6ab0fbea0d9e29715236a906bd..f9699c6edcf5c5ef74d3a1977341a8b41084aef7 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,
@@ -121,7 +122,6 @@ var whitelist = map[string]bool{
        "Containers.CrunchRunArgumentsList":        false,
        "Containers.CrunchRunCommand":              false,
        "Containers.DefaultKeepCacheRAM":           true,
-       "Containers.DefaultKeepCacheDisk":          true,
        "Containers.DispatchPrivateKey":            false,
        "Containers.JobsAPI":                       true,
        "Containers.JobsAPI.Enable":                true,
@@ -131,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,
@@ -163,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,
@@ -237,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,