[ARVADOS] updated: 1.2.0-99-g10c1e7359

[Git user]

Summary of changes:
 services/api/app/controllers/application_controller.rb | 12 +++++++++---
 services/api/config/application.default.yml            |  8 +++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

       via  10c1e7359286edd6562c52304e9706449a9ee53f (commit)
       via  c9af3e8511747cc3f530cdfe62f59955defe2121 (commit)
      from  f159fab8f9d6bc4254192ce43432defd5bd400aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 10c1e7359286edd6562c52304e9706449a9ee53f
Merge: f159fab8f c9af3e851
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Sep 5 14:56:46 2018 -0400

    Merge branch 'wtsi/13809-root_url-protocol-port-configuration'
    
    refs #13809
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit c9af3e8511747cc3f530cdfe62f59955defe2121
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Fri Jul 13 15:40:02 2018 +0000

    Allow hardcoding of protocol and port components of root_url alongside host
    
    Arvados-DCO-1.1-Signed-off-by: Joshua C. Randall <jcrandall at alum.mit.edu>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index ba7c07d27..169f4d40f 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -81,11 +81,17 @@ class ApplicationController < ActionController::Base
   end
 
   def default_url_options
+    options = {}
     if Rails.configuration.host
-      {:host => Rails.configuration.host}
-    else
-      {}
+      options[:host] = Rails.configuration.host
+    end
+    if Rails.configuration.port
+      options[:port] = Rails.configuration.port
+    end
+    if Rails.configuration.protocol
+      options[:protocol] = Rails.configuration.protocol
     end
+    options
   end
 
   def index
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index f976a83ca..5a1c22951 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -93,10 +93,12 @@ common:
   ### Overriding default advertised hostnames/URLs
   ###
 
-  # If not false, this is the hostname that will be used for root_url and
-  # advertised in the discovery document.  By default, use the default Rails
-  # logic for deciding on a hostname.
+  # If not false, this is the hostname, port, and protocol that will be used
+  # for root_url and advertised in the discovery document.  By default, use
+  # the default Rails logic for deciding on a hostname.
   host: false
+  port: false
+  protocol: false
 
   # Base part of SSH git clone url given with repository resources. If
   # true, the default "git at git.(uuid_prefix).arvadosapi.com:" is

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


hooks/post-receive
--