Merge branch '5416-repo-dir-is-uuid'

[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 8ecef119a708c044e10c1f3689d1756eddd0a06d..1696e2c56ebf9226126945c86b254144c7acd7fa 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -57,6 +57,11 @@ common:
   # 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
@@ -69,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