Merge branch 'master' of git.clinicalfuture.com:arvados into 1685-api-server-redirect...

diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb
index 9fbf80687d9adff03bab2e3ffe7b35eca8f13638..f64e9a41fadabb3b94047f40a6238b6b50861c5b 100644 (file)
--- a/services/api/app/controllers/static_controller.rb
+++ b/services/api/app/controllers/static_controller.rb
@@ -4,7 +4,7 @@ class StaticController < ApplicationController
   skip_before_filter :require_auth_scope_all, :only => [ :home, :login_failure ]
 
   def home
-    render 'intro'
+    redirect_to Rails.configuration.workbench_address
   end
 
 end

diff --git a/services/api/config/environments/development.rb.example b/services/api/config/environments/development.rb.example
index 5f6d32659c8cfb4b026d735acfd37f5207364ef1..dc33dce7cd74115ff383daef3f94667fd39fa64e 100644 (file)
--- a/services/api/config/environments/development.rb.example
+++ b/services/api/config/environments/development.rb.example
@@ -68,6 +68,9 @@ Server::Application.configure do
   config.admin_notifier_email_from = 'arvados@example.com'
   config.email_subject_prefix = '[ARVADOS] '
 
+  # Visitors to the API server will be redirected to the workbench
+  config.workbench_address = "http://localhost:3000/"
+
   # The e-mail address of the user you would like to become marked as an admin
   # user on their first login.
   # In the default configuration, authentication happens through the Arvados SSO

diff --git a/services/api/config/environments/production.rb.example b/services/api/config/environments/production.rb.example
index a171f9d53cebfc79a7d6f44e6975af326452ea9d..a2a9c164e02eb13de5f6794dcc296373fb4e85c6 100644 (file)
--- a/services/api/config/environments/production.rb.example
+++ b/services/api/config/environments/production.rb.example
@@ -93,6 +93,9 @@ Server::Application.configure do
   config.admin_notifier_email_from = 'arvados@example.com'
   config.email_subject_prefix = '[ARVADOS] '
 
+  # Visitors to the API server will be redirected to the workbench
+  config.workbench_address = "http://localhost:3000/"
+
   # The e-mail address of the user you would like to become marked as an admin
   # user on their first login.
   # In the default configuration, authentication happens through the Arvados SSO

diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example
index 5cbf27fa3a7b7b16b7c0c22e1e3dbbbbd6c5fcc7..39cbe698e3126fa4ca8049c873ca50d17c8f4917 100644 (file)
--- a/services/api/config/environments/test.rb.example
+++ b/services/api/config/environments/test.rb.example
@@ -72,4 +72,7 @@ Server::Application.configure do
   config.new_users_are_active = false
   config.admin_notifier_email_from = 'arvados@example.com'
   config.email_subject_prefix = '[ARVADOS] '
+
+  # Visitors to the API server will be redirected to the workbench
+  config.workbench_address = "http://localhost:3000/"
 end

diff --git a/services/api/script/rails b/services/api/script/rails
index 7c4ec52dfc8d73edea1a1274a55de13dbe0d055b..88627f559de4d507b3fac87c53c4aab111a235ec 100755 (executable)
--- a/services/api/script/rails
+++ b/services/api/script/rails
@@ -13,7 +13,7 @@ module Rails
     class Server < ::Rack::Server
         def default_options
             super.merge({
-                :Port => 3000,
+                :Port => 3001,
                 :environment => (ENV['RAILS_ENV'] || "development").dup,
                 :daemonize => false,
                 :debugger => false,