Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / tools / arvados_config.yml

diff --git a/tools/arvados_config.yml b/tools/arvados_config.yml
index 369046e68c0e2ff04a458c992faa472bab88b821..1ef77b86ce8aa6b71e58ea83e91c9eec31bcf32f 100644 (file)
--- a/tools/arvados_config.yml
+++ b/tools/arvados_config.yml
@@ -4,17 +4,20 @@ Clusters:
     SystemRootToken: systemusertesttoken1234567890aoeuidhtnsqjkxbmwvzpy
     API:
       RequestTimeout: 30s
+      VocabularyPath: ""
+      MaxTokenLifetime: 24h
     TLS:
       Insecure: true
     Collections:
       CollectionVersioning: true
       PreserveVersionIfIdle: -1s
       BlobSigningKey: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc
-      TrustAllContent: false
+      TrustAllContent: true
       ForwardSlashNameSubstitution: /
       ManagedProperties:
         original_owner_uuid: {Function: original_owner, Protected: true}
     Login:
+      TrustPrivateNetworks: true
       PAM:
         Enable: true
     StorageClasses: