From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Sat, 6 Apr 2019 14:29:08 +0000 (-0300)
Subject: 14873: Upgrades missing config settings.
X-Git-Tag: 1.4.0~74^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/61b19018e3bff1557d0e640ab4383d55aab9b59d

14873: Upgrades missing config settings.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index b9e4638f22..98443b428f 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -551,7 +551,8 @@ production:
   cache_classes: true
   consider_all_requests_local: false
   action_controller.perform_caching: true
-  serve_static_files: false
+  public_file_server:
+    enabled: false
   assets.compress: true
   assets.compile: false
   assets.digest: true
diff --git a/services/api/config/environments/production.rb.example b/services/api/config/environments/production.rb.example
index affb31d6bd..6c48dcd019 100644
--- a/services/api/config/environments/production.rb.example
+++ b/services/api/config/environments/production.rb.example
@@ -13,7 +13,7 @@ Server::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = false
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
diff --git a/services/api/config/environments/test.rb.example b/services/api/config/environments/test.rb.example
index 5ceb8f8b5d..6b550587cb 100644
--- a/services/api/config/environments/test.rb.example
+++ b/services/api/config/environments/test.rb.example
@@ -12,8 +12,8 @@ Server::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true