X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0e5dfbbcefcb462617ad89ef116a5b18f9e3ebc8..2d56bd2e4722e9c664f7605b3a46b505a30782db:/services/api/config/application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 1da5102222..1696e2c56e 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -15,7 +15,7 @@ development:
   active_record.auto_explain_threshold_in_seconds: 0.5
   assets.compress: false
   assets.debug: true
-  local_modified: <%= '-modified' if `git status -s` %>
+  local_modified: "<%= '-modified' if `git status -s` != '' %>"
 
 production:
   force_ssl: true
@@ -45,11 +45,23 @@ test:
   blob_signing_key: zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc
   user_profile_notification_address: arvados@example.com
   workbench_address: https://localhost:3001/
-  websocket_address: ws://127.0.0.1:3333/websocket
 
 common:
+  # The prefix used for all database identifiers to identify the record as
+  # originating from this site.  Must be exactly 5 alphanumeric characters
+  # (lowercase ASCII letters and digits).
   uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
 
+  # If not false, this is the hostname that will be used for root_url and
+  # advertised in the discovery document.  By default, use the default Rails
+  # logic for deciding on a hostname.
+  host: false
+
+  # If not false, this is the hostname that will be used to generate fetch_url
+  # and push_url for git repositories.  By default, this will be
+  # git.(uuid_prefix).arvadosapi.com
+  git_host: false
+
   # 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
@@ -62,6 +74,11 @@ common:
   # {git_repositories_dir}/arvados/.git
   git_repositories_dir: /var/lib/arvados/git
 
+  # If an arv-git-httpd service is running, advertise it in the
+  # discovery document by adding its public URI base here. Example:
+  # https://git.xxxxx.arvadosapi.com
+  git_http_base: false
+
   # This is a (bare) repository that stores commits used in jobs.  When a job
   # runs, the source commits are first fetched into this repository, then this
   # repository is used to deploy to compute nodes.  This should NOT be a
@@ -100,7 +117,7 @@ common:
   # silenced by throttling are not counted against this total.
   crunch_limit_log_bytes_per_job: 67108864
 
-  # Path to dns server configuration directory (e.g. /etc/unbound.d/conf.d), 
+  # Path to dns server configuration directory (e.g. /etc/unbound.d/conf.d),
   # or false = do not update dns server data.
   dns_server_conf_dir: false
 
@@ -231,8 +248,23 @@ common:
   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`.strip %>"
   local_modified: false
 
   # Default lifetime for ephemeral collections: 2 weeks.
   default_trash_lifetime: 1209600
+
+  # Permit insecure (OpenSSL::SSL::VERIFY_NONE) connections to the Single Sign
+  # On (sso) server.  Should only be enabled during development when the SSO
+  # server is using a self-signed cert.
+  sso_insecure: false
+
+  # Default replication level for collections. This is used when a
+  # collection's replication_desired attribute is nil.
+  default_collection_replication: 2
+
+  # Maximum size (in bytes) allowed for a single API request that will be
+  # published in the discovery document for use by clients.
+  # Note you must separately configure the upstream web server or proxy to
+  # actually enforce the desired maximum request size on the server side.
+  max_request_size: 134217728