projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2068-reset-user
[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..9162fc444585d9fa1e59ade9f0df7e144f81cbda 100644
(file)
--- a/
services/api/config/application.yml.example
+++ b/
services/api/config/application.yml.example
@@
-18,9
+18,14
@@
production:
uuid_prefix: bogus
uuid_prefix: bogus
- # This is suitable for AWS; see common section below for a static example.
+ # compute_node_domain: example.org
+ # compute_node_nameservers:
+ # - 127.0.0.1
+ # - 192.168.1.1
#
#
- #compute_node_nameservers: <%#
+ # 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]
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]
@@
-32,10
+37,5
@@
test:
secret_token: <%= rand(2**512).to_s(36) %>
common:
secret_token: <%= rand(2**512).to_s(36) %>
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
#git_repositories_dir: /var/cache/git
+ #git_internal_dir: /var/cache/arvados/internal.git