Merge remote-tracking branch 'MajewskiKrzysztof/exclude_home_project_parameter' into...

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

diff --git a/lib/config/export.go b/lib/config/export.go
index 9fe7d6cf27537442497fbf10debe3d392f379692..4e903a8b3d39398b80faf08199b77d9f146165b6 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -100,6 +100,7 @@ var whitelist = map[string]bool{
        "Collections.DefaultReplication":           true,
        "Collections.DefaultTrashLifetime":         true,
        "Collections.ForwardSlashNameSubstitution": true,
+       "Collections.KeepproxyPermission":          false,
        "Collections.ManagedProperties":            true,
        "Collections.ManagedProperties.*":          true,
        "Collections.ManagedProperties.*.*":        true,
@@ -108,10 +109,10 @@ var whitelist = map[string]bool{
        "Collections.TrashSweepInterval":           false,
        "Collections.TrustAllContent":              true,
        "Collections.WebDAVCache":                  false,
-       "Collections.KeepproxyPermission":          false,
-       "Collections.WebDAVPermission":             false,
        "Collections.WebDAVLogEvents":              false,
+       "Collections.WebDAVPermission":             false,
        "Containers":                               true,
+       "Containers.AlwaysUsePreemptibleInstances": true,
        "Containers.CloudVMs":                      false,
        "Containers.CrunchRunArgumentsList":        false,
        "Containers.CrunchRunCommand":              false,
@@ -138,11 +139,11 @@ var whitelist = map[string]bool{
        "Containers.StaleLockTimeout":              false,
        "Containers.SupportedDockerImageFormats":   true,
        "Containers.SupportedDockerImageFormats.*": true,
-       "Containers.AlwaysUsePreemptibleInstances": true,
        "Git":                                  false,
        "InstanceTypes":                        true,
        "InstanceTypes.*":                      true,
        "InstanceTypes.*.*":                    true,
+       "InstanceTypes.*.*.*":                  true,
        "Login":                                true,
        "Login.Google":                         true,
        "Login.Google.AlternateEmailAddresses": false,
@@ -150,6 +151,7 @@ var whitelist = map[string]bool{
        "Login.Google.ClientID":                               false,
        "Login.Google.ClientSecret":                           false,
        "Login.Google.Enable":                                 true,
+       "Login.IssueTrustedTokens":                            false,
        "Login.LDAP":                                          true,
        "Login.LDAP.AppendDomain":                             false,
        "Login.LDAP.EmailAttribute":                           false,
@@ -185,7 +187,6 @@ var whitelist = map[string]bool{
        "Login.Test.Enable":                                   true,
        "Login.Test.Users":                                    false,
        "Login.TokenLifetime":                                 false,
-       "Login.IssueTrustedTokens":                            false,
        "Login.TrustedClients":                                false,
        "Mail":                                                true,
        "Mail.EmailFrom":                                      false,
@@ -230,11 +231,11 @@ var whitelist = map[string]bool{
        "Users.NewUserNotificationRecipients":                 false,
        "Users.NewUsersAreActive":                             false,
        "Users.PreferDomainForUsername":                       false,
-       "Users.UserNotifierEmailFrom":                         false,
+       "Users.RoleGroupsVisibleToAll":                        false,
        "Users.UserNotifierEmailBcc":                          false,
+       "Users.UserNotifierEmailFrom":                         false,
        "Users.UserProfileNotificationAddress":                false,
        "Users.UserSetupMailText":                             false,
-       "Users.RoleGroupsVisibleToAll":                        false,
        "Volumes":                                             true,
        "Volumes.*":                                           true,
        "Volumes.*.*":                                         false,