[ARVADOS] updated: 36ca0d3ede8554a229d6872b151b7e79ce959ba9

[git at public.curoverse.com]

Summary of changes:
 services/api/app/controllers/static_controller.rb  |    2 +-
 .../api/config/environments/development.rb.example |    3 +++
 .../api/config/environments/production.rb.example  |    3 +++
 services/api/config/environments/test.rb.example   |    3 +++
 services/api/script/rails                          |    2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

       via  36ca0d3ede8554a229d6872b151b7e79ce959ba9 (commit)
       via  c541edf2f95153dc2fc2fdd82182262a2ad30b43 (commit)
       via  c2d962b16eb0a68a880326abfbc04d07db230815 (commit)
       via  37a977fcc8d0fe24b0316d952349d7a7b09625c1 (commit)
      from  5cf53c5f133040aa21ebfb4e7687e8759cfea636 (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 36ca0d3ede8554a229d6872b151b7e79ce959ba9
Merge: 5cf53c5 c541edf
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jan 7 14:04:23 2014 -0500

    Merge branch '1685-api-server-redirect-to-workbench'


commit c541edf2f95153dc2fc2fdd82182262a2ad30b43
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jan 7 14:03:34 2014 -0500

    Default redirect to workbench in production configuration to workbench.`hostname`

diff --git a/services/api/config/environments/production.rb.example b/services/api/config/environments/production.rb.example
index a2a9c16..357dd60 100644
--- a/services/api/config/environments/production.rb.example
+++ b/services/api/config/environments/production.rb.example
@@ -94,7 +94,7 @@ Server::Application.configure do
   config.email_subject_prefix = '[ARVADOS] '
 
   # Visitors to the API server will be redirected to the workbench
-  config.workbench_address = "http://localhost:3000/"
+  config.workbench_address = "http://workbench." + `hostname`
 
   # The e-mail address of the user you would like to become marked as an admin
   # user on their first login.

commit c2d962b16eb0a68a880326abfbc04d07db230815
Merge: 37a977f 259d69c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jan 2 13:22:35 2014 -0500

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


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


hooks/post-receive
--