3889: minor test assertion updates

[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 668ba00d0f39251aafc0d5f56961982bc305596c..7571bb08dd793362dc57e9b559c8d659f8a500ea 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -43,13 +43,18 @@ test:
   uuid_prefix: zzzzz
   secret_token: <%= rand(2**512).to_s(36) %>
   blob_signing_key: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc
-
-  # email address to which mail should be sent when the user creates profile for the first time
   user_profile_notification_address: arvados@example.com
+  workbench_address: https://localhost:3001/
 
 common:
   uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
 
+  # If this is not false, HTML requests at the API server's root URL
+  # are redirected to this location, and it is provided in the text of
+  # user activation notification email messages to remind them where
+  # to log in.
+  workbench_address: false
+
   # Git repositories must be readable by api server, or you won't be
   # able to submit crunch jobs. To pass the test suites, put a clone
   # of the arvados tree in {git_repositories_dir}/arvados.git or
@@ -109,16 +114,15 @@ common:
 
   accept_api_token: {}
 
+  # When new_users_are_active is set to true, the user agreement check is skipped.
   new_users_are_active: false
+
   admin_notifier_email_from: arvados@example.com
   email_subject_prefix: "[ARVADOS] "
   user_notifier_email_from: arvados@example.com
   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
@@ -181,6 +185,19 @@ common:
   # email address to which mail should be sent when the user creates profile for the first time
   user_profile_notification_address: false
 
+  default_openid_prefix: https://www.google.com/accounts/o8/id
+
+  # Config parameters to automatically setup new users.
+  # The params auto_setup_new_users_with_* are meaningful only when auto_setup_new_users is turned on.
+  # auto_setup_name_blacklist is a list of usernames to be blacklisted for auto setup.
+  auto_setup_new_users: false
+  auto_setup_new_users_with_vm_uuid: false
+  auto_setup_new_users_with_repository: false
+  auto_setup_name_blacklist: [arvados, git, gitolite, gitolite-admin, root, syslog]
+
   # source_version
-  source_version: <%= `git log -n 1 --format=%H` %>
+  source_version: "<%= `git log -n 1 --format=%h` %>"
   local_modified: false
+
+  # Default lifetime for ephemeral collections: 2 weeks.
+  default_trash_lifetime: 1209600