Accept data from a generator in arvados.CollectionWriter.write()

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

diff --git a/docker/api/production.rb.in b/docker/api/production.rb.in
index db42c2f49d33408140f2a79dfe7d2270b7e1120c..417b915d70f75e603821e9c19b6ea5c055e5f829 100644 (file)
--- a/docker/api/production.rb.in
+++ b/docker/api/production.rb.in
@@ -75,9 +75,7 @@ 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.uuid_prefix = '@@API_HOSTNAME@@'
 
@@ -88,4 +86,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