projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16470-api-rails-52'
[arvados.git]
/
services
/
api
/
config
/
environments
/
production.rb.example
diff --git
a/services/api/config/environments/production.rb.example
b/services/api/config/environments/production.rb.example
index ac6ce1b8ed87473aae9bb1e0dba9b23affebc655..c8194057ccfc731d5fbf91b2fdfd55d0c417f812 100644
(file)
--- a/
services/api/config/environments/production.rb.example
+++ b/
services/api/config/environments/production.rb.example
@@
-1,4
+1,8
@@
-Server::Application.configure do
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb
# Code is not reloaded between requests
# Settings specified here will take precedence over those in config/application.rb
# Code is not reloaded between requests
@@
-9,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.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.
serve_static_assets
= false
+ config.
public_file_server.enabled
= false
# Compress JavaScripts and CSS
config.assets.compress = true
# Compress JavaScripts and CSS
config.assets.compress = true
@@
-47,8
+51,7
@@
Server::Application.configure do
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
- config.action_mailer.raise_delivery_errors = true
- config.action_mailer.perform_deliveries = true
+ # config.action_mailer.perform_deliveries = true
# Enable threaded mode
# config.threadsafe!
# Enable threaded mode
# config.threadsafe!
@@
-60,4
+63,5
@@
Server::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
+ config.log_level = :info
end
end