Fix bugs introduced from merge with master. (refs #2221)

[arvados.git] / docker / api / production.rb.in

diff --git a/docker/api/production.rb.in b/docker/api/production.rb.in
index db42c2f49d33408140f2a79dfe7d2270b7e1120c..967d185f47c179b60acc78be994deed8bb233c1c 100644 (file)
--- a/docker/api/production.rb.in
+++ b/docker/api/production.rb.in
@@ -65,6 +65,10 @@ Server::Application.configure do
   config.crunch_job_wrapper = :slurm_immediate
   config.crunch_job_user = 'crunch' # if false, do not set uid when running jobs
 
+  # The web service must be able to create/write this file, and
+  # crunch-job must be able to stat() it.
+  config.crunch_refresh_trigger = '/tmp/crunch_refresh_trigger'
+
   # config.dnsmasq_conf_dir = '/etc/dnsmasq.d'
 
   # config.compute_node_ami = 'ami-cbca41a2'
@@ -75,10 +79,8 @@ Server::Application.configure do
 
   # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
   require 'net/http'
-  config.compute_node_nameservers = ['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'
-
+  config.compute_node_nameservers = [ '@@ARVADOS_DNS_SERVER@@' ]
+  config.compute_node_domain = false
   config.uuid_prefix = '@@API_HOSTNAME@@'
 
   # Authentication stub: hard code pre-approved API tokens.
@@ -88,4 +90,11 @@ Server::Application.configure do
   config.new_users_are_active = false
   config.admin_notifier_email_from = 'arvados@example.com'
   config.email_subject_prefix = '[ARVADOS] '
+
+  # 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.
+  config.auto_admin_user = '@@API_AUTO_ADMIN_USER@@'
 end