X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5ff990155f06109c55bbb832a8dd670265d3f3d1..3f904a5ede4a8ed57dc93b20bc61427af21c8b36:/apps/workbench/config/application.default.yml

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 2b1a49b5aa..b485276c09 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -1,6 +1,32 @@
 # Do not use this file for site configuration. Create application.yml
 # instead (see application.yml.example).
 
+# Below is a sample setting for diagnostics testing.
+# Configure workbench URL as "arvados_workbench_url"
+# Configure test user tokens as "user_tokens".
+#   At this time the tests need an "active" user token.
+# Also, configure the pipelines to be executed as "pipelines_to_test".
+# For each of the pipelines identified by the name of your choice
+#     ("pipeline_1" and "pipeline_2" in this sample), provide the following:
+#   template_uuid: is the uuid of the template to be executed
+#   input_paths: an array of inputs for the pipeline. Use either a collection's "uuid"
+#     or a file's "uuid/file_name" path in this array. If the pipeline does not require
+#     any inputs, this can be omitted. 
+#   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:3031
+  user_tokens:
+    active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
+  pipelines_to_test:
+    pipeline_1:
+      template_uuid: zzzzz-p5p6p-rxj8d71854j9idn
+      input_paths: [zzzzz-4zz18-nz98douzhaa3jh2]
+      max_wait_seconds: 10
+    pipeline_2:
+      template_uuid: zzzzz-p5p6p-1xbobfobk94ppbv
+      input_paths: [zzzzz-4zz18-nz98douzhaa3jh2, zzzzz-4zz18-gpw9o5wpcti3nib]
+
 development:
   cache_classes: false
   eager_load: true
@@ -12,7 +38,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
@@ -32,6 +63,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:
@@ -53,8 +89,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
@@ -134,7 +170,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
@@ -142,26 +178,8 @@ common:
   issue_reporter_email_to: arvados@example.com
   support_email_address: arvados@example.com
 
-  # Configuration for diagnostics testing. Use this to enable diagnostics testing for an env.
-  diagnostics_testing_user_tokens: false
-  diagnostics_testing_pipeline_fields: false
-
-  # Below is a sample setting for diagnostics testing.
-  # Configure test user tokens as "diagnostics_testing_user_tokens".
-  #   At this time the tests need an "active" user token.
-  # Also, configure the pipelines to be executed as "diagnostics_testing_pipeline_fields".
-  # For each of the pipelines identified by the name of your choice
-  #     ("tutorial pipeline" and "tutorial pipeline 2" in this sample):
-  #   template_uuid: is the uuid of the template to be executed
-  #   input_paths: an array of inputs for the pipeline. Use either a collection's "uuid"
-  #     or a file's "uuid/file_name" path in this array. If the pipeline does not require
-  #     any inputs, this can be omitted. 
-  #diagnostics_testing_user_tokens:
-  #  active: eu33jurqntstmwo05h1jr3eblmi961e802703y6657s8zb14r
-  #diagnostics_testing_pipeline_fields:
-  #  tutorial pipeline:
-  #    template_uuid: zzzzz-p5p6p-rxj8d71854j9idn
-  #    input_paths: [zzzzz-4zz18-u9pmni8msw9zm9n]
-  #  tutorial pipeline 2:
-  #    template_uuid: zzzzz-p5p6p-kfwus81of6y3ezs
-  #    input_paths: [zzzzz-4zz18-u9pmni8msw9zm9n]
+  # 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