Merge branch 'master' into 3112-report-bug

[arvados.git] / services / api / config / application.yml.example

diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index a9c33a4bae199e1cb6f486c8f90ab40eb2eefd36..d6de1ff9b55ac003bb4063332eaffef8f0ceb8f7 100644 (file)
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -11,31 +11,21 @@
 # 5. Section in application.default.yml called "common"
 
 development:
+  # Mandatory site secrets. See application.default.yml for more info.
+  secret_token: ~
+  blob_signing_key: ~
 
 production:
-  # At minimum, you need a nice long randomly generated secret_token here.
+  # Mandatory site secrets. See application.default.yml for more info.
   secret_token: ~
-
+  blob_signing_key: ~
   uuid_prefix: bogus
 
-  # This is suitable for AWS; see common section below for a static example.
-  #
-  #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'
-  %>
-
 test:
-  uuid_prefix: zzzzz
-  secret_token: <%= rand(2**512).to_s(36) %>
+  # Tests should be able to run without further configuration, but if you do
+  # want to change your local test configuration, this is where to do it.
 
 common:
-
-  # Git repositories must be readable by api server, or you won't be
-  # able to submit crunch jobs. To pass the test suites, put a clone
-  # of the arvados tree in {git_repositories_dir}/arvados.git or
-  # {git_repositories_dir}/arvados/.git
-  #
-  #git_repositories_dir: /var/cache/git
+  # Settings in this section will be used in all environments
+  # (development, production, test) except when overridden in the
+  # environment-specific sections above.