Merge branch 'master' into 2257-inequality-conditions

[arvados.git] / services / api / config / environments / test.rb.example

diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example
index 39cbe698e3126fa4ca8049c873ca50d17c8f4917..10608c15e356fdbede112a7f523db26dedd8db09 100644 (file)
--- a/services/api/config/environments/test.rb.example
+++ b/services/api/config/environments/test.rb.example
@@ -54,6 +54,7 @@ Server::Application.configure do
   # config.compute_node_ami = 'ami-cbca41a2'
   # config.compute_node_ec2run_args = '-g arvados-compute'
   # config.compute_node_spot_bid = 0.11
+  config.compute_node_ec2_tag_enable = false
 
   # config.compute_node_domain = `hostname --domain`.strip
 
@@ -63,7 +64,7 @@ Server::Application.configure do
   # config.compute_node_nameservers = ['1.2.3.4', '1.2.3.5']
   config.compute_node_nameservers = [ "172.16.0.23" ]
 
-  config.uuid_prefix('test@' + `hostname`.strip)
+  config.uuid_prefix = 'zzzzz'
 
   # Authentication stub: hard code pre-approved API tokens.
   # config.accept_api_token = { rand(2**256).to_s(36) => true }
@@ -75,4 +76,11 @@ Server::Application.configure do
 
   # Visitors to the API server will be redirected to the workbench
   config.workbench_address = "http://localhost:3000/"
+
+  # 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 = ''
 end