Merge branch 'master' into 3836-remove-collection-from-project-bug

[arvados.git] / services / api / config / application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 78d1d513c419dfe5e6e35d345b079ee41a7792b2..5526501905c8d4cbafb04cdd3ee5f6c57d09bb13 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -17,6 +17,10 @@ development:
   assets.debug: true
   local_modified: <%= '-modified' if `git status -s` %>
 
+  # Visitors to the API server will be redirected to the workbench
+  # By default, workbench_address is unset.
+  #workbench_address: https://workbench.local:3031/
+
 production:
   force_ssl: true
   cache_classes: true
@@ -27,6 +31,10 @@ production:
   assets.compile: false
   assets.digest: true
 
+  # Visitors to the API server will be redirected to the workbench
+  # By default, workbench_address is unset.
+  #workbench_address: <%= "https://workbench." + `hostname`.strip %>
+
 test:
   force_ssl: false
   cache_classes: true
@@ -47,6 +55,9 @@ test:
   # email address to which mail should be sent when the user creates profile for the first time
   user_profile_notification_address: arvados@example.com
 
+  # Visitors to the API server will be redirected to the workbench
+  workbench_address: https://localhost:3001/
+
 common:
   uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
 
@@ -118,9 +129,6 @@ common:
   new_user_notification_recipients: [ ]
   new_inactive_user_notification_recipients: [ ]
 
-  # Visitors to the API server will be redirected to the workbench
-  workbench_address: https://workbench.local:3001/
-
   # 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