Merge branch 'master' of git.clinicalfuture.com:arvados

[arvados.git] / docker / config.yml.example

diff --git a/docker/config.yml.example b/docker/config.yml.example
index 5eab7116e9c1c06d48fc6a677959616099abe628..5247e3738afde797c3a7006dc0ddb6f7cd328805 100644 (file)
--- a/docker/config.yml.example
+++ b/docker/config.yml.example
@@ -6,6 +6,10 @@
 ARVADOS_DOMAIN:         # e.g. arvados.internal
 ARVADOS_DNS_SERVER:     # e.g. 192.168.0.1
 
+# ==============================
+# API server settings
+# ==============================
+
 # The API server hostname. Must be a 5-character
 # string unique within this installation. This string
 # will also be used as config.uuid_prefix.
@@ -40,7 +44,9 @@ OMNIAUTH_APP_ID: arvados-server
 # The URL for this installation's Omniauth server.
 OMNIAUTH_URL: http://auth.clinicalfuture.com
 
+# ==============================
 # Workbench settings
+# ==============================
 WORKBENCH_RAILS_MODE: production
 WORKBENCH_DATA_IMPORT_DIR: /data/arvados-workbench-upload/data
 WORKBENCH_DATA_EXPORT_DIR: /data/arvados-workbench-download/data
@@ -48,13 +54,13 @@ WORKBENCH_VCF_PIPELINE_UUID:
 WORKBENCH_SITE_NAME: Arvados Workbench
 WORKBENCH_INSECURE_HTTPS: false
 WORKBENCH_ACTIVATION_CONTACT_LINK: mailto:arvados@clinicalfuture.com
-WORKBENCH_ARVADOS_LOGIN_BASE: https://@@API_HOSTNAME@@.arvadosapi.com/login
-WORKBENCH_ARVADOS_V1_BASE: https://@@API_HOSTNAME@@.arvadosapi.com/arvados/v1
+WORKBENCH_ARVADOS_LOGIN_BASE: https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/login
+WORKBENCH_ARVADOS_V1_BASE: https://@@API_HOSTNAME@@.@@ARVADOS_DOMAIN@@/arvados/v1
 WORKBENCH_SECRET:
-# /Workbench settings
 
+# ==============================
 # SSO settings
+# ==============================
 SSO_HOSTNAME: sso
 SSO_SECRET:
 SSO_CLIENT_SECRET:
-# /SSO settings