[ARVADOS] updated: 48d04722a5e0478e22be33f58036806a55b3a0eb

[git at public.curoverse.com]

Summary of changes:
 docker/build_tools/build.rb                       | 2 +-
 services/api/app/controllers/static_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  48d04722a5e0478e22be33f58036806a55b3a0eb (commit)
      from  94b11dfc98ed84d0f91f2bc2fc81e76b4d3c35d7 (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 48d04722a5e0478e22be33f58036806a55b3a0eb
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Sep 25 16:30:33 2014 -0400

    3991: Change docker default to "no root url redirect". Make "not found" message more friendly.

diff --git a/docker/build_tools/build.rb b/docker/build_tools/build.rb
index cda8651..a79157f 100755
--- a/docker/build_tools/build.rb
+++ b/docker/build_tools/build.rb
@@ -84,7 +84,7 @@ def main options
       config['API_AUTO_ADMIN_USER'] = admin_email_address
       config['ARVADOS_USER_NAME'] = user_name
       config['API_HOSTNAME'] = generate_api_hostname
-      config['API_WORKBENCH_ADDRESS'] = 'http://localhost:9899'
+      config['API_WORKBENCH_ADDRESS'] = 'false'
       config['PUBLIC_KEY_PATH'] = find_or_create_ssh_key(config['API_HOSTNAME'])
       config.each_key do |var|
         config_out.write "#{var}: #{config[var]}\n"
diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb
index 6ee46e0..d624ea8 100644
--- a/services/api/app/controllers/static_controller.rb
+++ b/services/api/app/controllers/static_controller.rb
@@ -11,7 +11,7 @@ class StaticController < ApplicationController
         if Rails.configuration.workbench_address
           redirect_to Rails.configuration.workbench_address
         else
-          render_not_found "Path not found."
+          render_not_found "Oops, this is an API endpoint. You probably want to point your browser to an Arvados Workbench site instead."
         end
       end
       f.json do

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


hooks/post-receive
--