Merge branch '2412-do-not-reuse-task-work-dirs'

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

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 11dcc54b043ed9a1b044c2b229f9c1f02a00673f..e46ff5dd187c2777060d1bd9dba16132e875cfa9 100644 (file)
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -65,7 +65,7 @@ common:
   compute_node_ec2run_args: -g arvados-compute
   compute_node_spot_bid: 0.11
 
-  compute_node_domain: <%= `hostname`.split('.')[1..-1].join('.').strip %>
+  compute_node_domain: false
   compute_node_nameservers:
     - 192.168.1.1
   compute_node_ec2_tag_enable: false
@@ -85,3 +85,17 @@ common:
   # server, which uses openid against Google's servers, so in that case this
   # should be an address associated with a Google account.
   auto_admin_user: false
+
+  ## Set Time.zone default to the specified zone and make Active
+  ## Record auto-convert to this zone.  Run "rake -D time" for a list
+  ## of tasks for finding time zone names. Default is UTC.
+  #time_zone: Central Time (US & Canada)
+
+  ## Default encoding used in templates for Ruby 1.9.
+  encoding: utf-8
+
+  # Enable the asset pipeline
+  assets.enabled: true
+
+  # Version of your assets, change this if you want to expire all your assets
+  assets.version: "1.0"