15273: Fix key-conflict test.

[arvados.git] / lib / config / config.default.yml

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index d46c5c0ae1b3cbfddeb7f830c460ce8c4f9335e3..bd4c3521d17bfeba58d851a42768c290ed229f27 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -69,11 +69,11 @@ Clusters:
       Connection:
         # All parameters here are passed to the PG client library in a connection string;
         # see https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
-        Host: ""
-        Port: 0
-        User: ""
-        Password: ""
-        DBName: ""
+        host: ""
+        port: ""
+        user: ""
+        password: ""
+        dbname: ""
     API:
       # Maximum size (in bytes) allowed for a single API request.  This
       # limit is published in the discovery document for use by clients.
@@ -109,6 +109,15 @@ Clusters:
       # update on the permission view in the future, if not already scheduled.
       AsyncPermissionsUpdateInterval: 20
 
+      # Maximum number of concurrent outgoing requests to make while
+      # serving a single incoming multi-cluster (federated) request.
+      MaxRequestAmplification: 4
+
+      # RailsSessionSecretToken is a string of alphanumeric characters
+      # used by Rails to sign session tokens. IMPORTANT: This is a
+      # site secret. It should be at least 50 characters.
+      RailsSessionSecretToken: ""
+
     Users:
       # Config parameters to automatically setup new users.  If enabled,
       # this users will be able to self-activate.  Enable this if you want
@@ -153,8 +162,8 @@ Clusters:
       # Arvados object is created, modified, or deleted.)
       #
       # Currently, websocket event notifications rely on audit logs, so
-      # this should not be set lower than 600 (5 minutes).
-      MaxAge: 1209600
+      # this should not be set lower than 300 (5 minutes).
+      MaxAge: 336h
 
       # Maximum number of log rows to delete in a single SQL transaction.
       #
@@ -225,11 +234,11 @@ Clusters:
       # blob_signing_key note above.
       #
       # The default is 2 weeks.
-      BlobSigningTTL: 1209600
+      BlobSigningTTL: 336h
 
       # Default lifetime for ephemeral collections: 2 weeks. This must not
       # be less than blob_signature_ttl.
-      DefaultTrashLifetime: 1209600
+      DefaultTrashLifetime: 336h
 
       # Interval (seconds) between trash sweeps. During a trash sweep,
       # collections are marked as trash if their trash_at time has