[ARVADOS] created: 1.1.1-151-g61f82e9

[Git user]

        at  61f82e9c0d9d543b86bd4fedfed2d5330eaf34c5 (commit)


commit 61f82e9c0d9d543b86bd4fedfed2d5330eaf34c5
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Dec 5 12:55:01 2017 -0500

    12752: Publish keepWebServiceUrl in discovery doc.
    
    Adds keep_web_service_url to API config.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb
index 6f893bc..3adbe9e 100644
--- a/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@ -51,6 +51,7 @@ class Arvados::V1::SchemaController < ApplicationController
         crunchLogPartialLineThrottlePeriod: Rails.application.config.crunch_log_partial_line_throttle_period,
         websocketUrl: Rails.application.config.websocket_address,
         workbenchUrl: Rails.application.config.workbench_address,
+        keepWebServiceUrl: Rails.application.config.keep_web_service_url,
         parameters: {
           alt: {
             type: "string",
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 2f32556..778c3d4 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -446,6 +446,13 @@ common:
   # Server expects request header of the format "Authorization: Bearer xxx"
   ManagementToken: false
 
+  # URL of keep-web service.  Provides read/write access to collections via
+  # HTTP and WebDAV protocols.
+  #
+  # Example:
+  # keep_web_service_url: https://download.uuid_prefix.arvadosapi.com/
+  keep_web_service_url: false
+
 development:
   force_ssl: false
   cache_classes: false

-----------------------------------------------------------------------


hooks/post-receive
--