Merge branch 'master' into 3408-production-datamanager

[arvados.git] / apps / workbench / config / application.yml.example

diff --git a/apps/workbench/config/application.yml.example b/apps/workbench/config/application.yml.example
index 5db52ed92519830b27d641ea40c31cf499d21281..bd19dd59b38e6f31746c5871b4094429a363ea51 100644 (file)
--- a/apps/workbench/config/application.yml.example
+++ b/apps/workbench/config/application.yml.example
@@ -10,19 +10,20 @@
 # 4. Section in application.default.yml corresponding to RAILS_ENV
 # 5. Section in application.default.yml called "common"
 
-common:
+development:
   # At minimum, you need a nice long randomly generated secret_token here.
   secret_token: ~
 
   # You probably also want to point to your API server.
-  arvados_login_base: https://arvados.local:3000/login
-  arvados_v1_base: https://arvados.local:3000/arvados/v1
+  arvados_login_base: https://arvados.local:3030/login
+  arvados_v1_base: https://arvados.local:3030/arvados/v1
   arvados_insecure_https: true
 
-test:
-  # When you run the Workbench's integration tests, it starts the API server
-  # as a dependency.  These settings should match the API server's Rails
-  # defaults.  If you adjust those, change these settings to match.
-  arvados_login_base: https://localhost:3001/login
-  arvados_v1_base: https://localhost:3001/arvados/v1
-  arvados_insecure_https: true
+production:
+  # At minimum, you need a nice long randomly generated secret_token here.
+  secret_token: ~
+
+  # You probably also want to point to your API server.
+  arvados_login_base: https://arvados.local:3030/login
+  arvados_v1_base: https://arvados.local:3030/arvados/v1
+  arvados_insecure_https: false