[ARVADOS] created: 37a977fcc8d0fe24b0316d952349d7a7b09625c1

[git at public.curoverse.com]

        at  37a977fcc8d0fe24b0316d952349d7a7b09625c1 (commit)


commit 37a977fcc8d0fe24b0316d952349d7a7b09625c1
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jan 2 13:21:34 2014 -0500

    Added redirect to config file.

diff --git a/services/api/app/controllers/static_controller.rb b/services/api/app/controllers/static_controller.rb
index 9fbf806..f64e9a4 100644
--- 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 5f6d326..dc33dce 100644
--- 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 at 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 a171f9d..a2a9c16 100644
--- 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 at 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 5cbf27f..39cbe69 100644
--- 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 at 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 7c4ec52..88627f5 100755
--- 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,

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


hooks/post-receive
--