6362: Allow config/application.yml to override environments/*.rb in apiserver, too.

[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 8f3207a71921e6ac06c939579f95bbd0a1f2458d..409dea63bb49c08e458f197f89bfbbeb68ee1231 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -41,6 +41,9 @@ test:
   active_support.deprecation: :stderr
   active_record.mass_assignment_sanitizer: :strict
   uuid_prefix: zzzzz
+  sso_app_id: arvados-server
+  sso_app_secret: <%= rand(2**512).to_s(36) %>
+  sso_provider_url: http://localhost:3002
   secret_token: <%= rand(2**512).to_s(36) %>
   blob_signing_key: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc
   user_profile_notification_address: arvados@example.com
@@ -291,6 +294,12 @@ common:
   # server is using a self-signed cert.
   sso_insecure: false
 
+  # These settings are provided by your OAuth2 provider (e.g.,
+  # sso-provider).
+  sso_app_id: ~
+  sso_app_secret: ~
+  sso_provider_url: ~
+
   # Default replication level for collections. This is used when a
   # collection's replication_desired attribute is nil.
   default_collection_replication: 2
@@ -342,8 +351,6 @@ common:
   # with your DNS records and your /etc/slurm-llnl/slurm.conf files.
   #
   # Example for compute0000, compute0001, ....:
-  # assign_node_hostname: compute#{slot_number.to_s.rjust(4, "0")}
-  # or
   # assign_node_hostname: compute%<slot_number>04d
   # (See http://ruby-doc.org/core-2.2.2/Kernel.html#method-i-format for more.)
-  assign_node_hostname: compute#{slot_number}
+  assign_node_hostname: compute%<slot_number>d