Merge branch 'master' into 4951-request-vm

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

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 7eb6c8ba23a854622f24a37eb7e8ad69d3b409f6..8be89b854575cb788c6a3c89dfb24434b3a0281f 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -15,7 +15,7 @@
 #   max_wait_seconds: max time in seconds to wait for the pipeline run to complete.
 #     Default value of 30 seconds is used when this value is not provided.
 diagnostics:
-  arvados_workbench_url: https://localhost:3000
+  arvados_workbench_url: https://localhost:3031
   user_tokens:
     active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
   pipelines_to_test:
@@ -27,6 +27,13 @@ diagnostics:
       template_uuid: zzzzz-p5p6p-1xbobfobk94ppbv
       input_paths: [zzzzz-4zz18-nz98douzhaa3jh2, zzzzz-4zz18-gpw9o5wpcti3nib]
 
+# Below is a sample setting for performance testing.
+# Configure workbench URL as "arvados_workbench_url"
+# Configure test user token as "user_token".
+performance:
+  arvados_workbench_url: https://localhost:3031
+  user_token: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
+
 development:
   cache_classes: false
   eager_load: true
@@ -38,7 +45,12 @@ development:
   assets.debug: true
   profiling_enabled: true
   site_name: Arvados Workbench (dev)
-  local_modified: <%= '-modified' if `git status -s` %>
+  local_modified: "<%= '-modified' if `git status -s` != '' %>"
+
+  # API server configuration
+  arvados_login_base: ~
+  arvados_v1_base: ~
+  arvados_insecure_https: ~
 
 production:
   force_ssl: true
@@ -58,6 +70,11 @@ production:
   data_import_dir: /data/arvados-workbench-upload/data
   data_export_dir: /data/arvados-workbench-download/data
 
+  # API server configuration
+  arvados_login_base: ~
+  arvados_v1_base: ~
+  arvados_insecure_https: ~
+
   site_name: Arvados Workbench
 
 test:
@@ -79,8 +96,8 @@ test:
   # server as a dependency.  These settings should match the API
   # server's Rails defaults.  If you adjust those, change these
   # settings in application.yml to match.
-  arvados_login_base: https://localhost:3001/login
-  arvados_v1_base: https://localhost:3001/arvados/v1
+  arvados_login_base: https://localhost:3000/login
+  arvados_v1_base: https://localhost:3000/arvados/v1
   arvados_insecure_https: true
 
   site_name: Workbench:test
@@ -160,7 +177,7 @@ common:
   user_profile_form_message: Welcome to Arvados. All <span style="color:red">required fields</span> must be completed before you can proceed.
 
   # source_version
-  source_version: "<%= `git log -n 1 --format=%h` %>"
+  source_version: "<%= `git log -n 1 --format=%h`.strip %>"
   local_modified: false
 
   # report notification to and from addresses
@@ -168,8 +185,16 @@ common:
   issue_reporter_email_to: arvados@example.com
   support_email_address: arvados@example.com
 
+  # generic issue email from
+  email_from: arvados@example.com
+
   # filename suffixes for which view icon would be shown in collection show page
   filename_suffixes_with_view_icon: [txt, gif, jpeg, jpg, png, html, htm, pdf]
 
   # the maximum number of bytes to load in the log viewer
   log_viewer_max_bytes: 1000000
+
+  # Set anonymous_user_token to enable anonymous user access. You can get
+  # the token by running "bundle exec ./script/get_anonymous_user_token.rb"
+  # in the directory where your API server is running.
+  anonymous_user_token: false