Fix building packages: work around pip having a mind of its own with

[arvados.git] / docker / api / application.yml.in

diff --git a/docker/api/application.yml.in b/docker/api/application.yml.in
index a60b4e6826c609591f46d080c5a6954de20de099..97eb66f5db2fc79bcd1236a6895270a2eec22ea8 100644 (file)
--- a/docker/api/application.yml.in
+++ b/docker/api/application.yml.in
@@ -19,6 +19,13 @@ development:
   blob_signing_key: ~
 
 production:
+  host: api.@@ARVADOS_DOMAIN@@
+
+  git_repo_ssh_base: "git@api.@@ARVADOS_DOMAIN@@:"
+
+  # Docker setup doesn't include arv-git-httpd yet.
+  git_repo_https_base: false
+
   # At minimum, you need a nice long randomly generated secret_token here.
   # Use a long string of alphanumeric characters (at least 36).
   secret_token: @@API_SECRET@@
@@ -30,26 +37,11 @@ production:
 
   uuid_prefix: @@API_HOSTNAME@@
 
-  # 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
-  # server, which uses openid against Google's servers, so in that case this
-  # should be an address associated with a Google account.
-  auto_admin_user: @@API_AUTO_ADMIN_USER@@
-
   # compute_node_domain: example.org
   # compute_node_nameservers:
   #   - 127.0.0.1
   #   - 192.168.1.1
   #
-  # The version below is suitable for AWS.
-  # Uncomment and change <%# to <%= to use it.
-  # compute_node_nameservers: <%#
-  #   require 'net/http'
-  #   ['local', 'public'].collect do |iface|
-  #     Net::HTTP.get(URI("http://169.254.169.254/latest/meta-data/#{iface}-ipv4")).match(/^[\d\.]+$/)[0]
-  #   end << '172.16.0.23'
-  # %>
   permit_create_collection_with_unsigned_manifest: true
   git_repositories_dir: /home/git/repositories
   crunch_job_wrapper: :slurm_immediate
@@ -58,6 +50,14 @@ production:
 
   workbench_address: @@API_WORKBENCH_ADDRESS@@
 
+  auto_setup_new_users: true
+
+  auto_admin_first_user: true
+
+  auto_setup_new_users_with_repository: true
+
+  auto_setup_new_users_with_vm_uuid: @@API_HOSTNAME@@-2x53u-csbtkecoa669vkz
+
 test:
   uuid_prefix: zzzzz
   secret_token: <%= rand(2**512).to_s(36) %>
@@ -65,4 +65,3 @@ test:
 common:
   #git_repositories_dir: /var/cache/git
   #git_internal_dir: /var/cache/arvados/internal.git
-