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 b9e4638f2235f748c834631cc9e4c86d625ae7b3..98443b428f5313c82c5182cf348eb410c6c99b7d 100644 (file)
--- 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 affb31d6bdd651b37c38a783efd603b74436704d..6c48dcd0196209f3b16a31f64f48ad93fa06244b 100644 (file)
--- 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 5ceb8f8b5d8bb4c7ad87342c93642c19632f36b7..6b550587cbb28b95d7b07bf1f0841afe6ec5bdc4 100644 (file)
--- 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