projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2884-improved-picker
[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 e0420ce076145a8a776aa7dbc4c27085a0cc94f0..d6db3a4f8b7bcca3aea4c9d92974d9d131b307c5 100644
(file)
--- a/
services/api/config/application.yml.example
+++ b/
services/api/config/application.yml.example
@@
-38,11
+38,11
@@
production:
# The version below is suitable for AWS.
# Uncomment and change <%# to <%= to use it.
# 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]
- end << '172.16.0.23'
- %>
+
#
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
test:
uuid_prefix: zzzzz
@@
-52,6
+52,3
@@
common:
#git_repositories_dir: /var/cache/git
#git_internal_dir: /var/cache/arvados/internal.git
#git_repositories_dir: /var/cache/git
#git_internal_dir: /var/cache/arvados/internal.git
- # Amount of time (in seconds) for which a blob permission signature
- # remains valid. Default: 2 weeks (1209600 seconds)
- #blob_signing_ttl: 1209600