Merge branch 'master' into 2755-python-sdk-permissions

[arvados.git] / services / api / config / application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 67aa401eca2433c3b71da4575b8010af4cc4553e..a3ff6800be23bf336f8741a147c642000d1a69b9 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -43,6 +43,7 @@ test:
 
 common:
   secret_token: ~
+  blob_signing_key: ~
   uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
 
   # Git repositories must be readable by api server, or you won't be
@@ -122,3 +123,7 @@ common:
   # configuration variable so that the primary server can give out the correct
   # address of the dedicated websocket server:
   #websocket_address: wss://127.0.0.1:3333/websocket
+
+  # Amount of time (in seconds) for which a blob permission signature
+  # remains valid.  Default: 2 weeks (1209600 seconds)
+  blob_signing_ttl: 1209600