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 bd877f6e725073d147e3202b74f9686d90ff64f4..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] %>
 
@@ -109,16 +120,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 +191,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