Merge pull request #4318 from tomhughes/rails-71-defaults

[rails.git] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index aef8c698692d23f57fbbd103153ae9d2a85dd1fd..5ce25fc2c649e86f6cf5a03682d7fb24503b9eec 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -4,7 +4,7 @@ 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.

-  config.cache_classes = true
+  config.enable_reloading = false

 
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both threaded web servers
 
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both threaded web servers


@@ -16,13 +16,12 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 

-  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
-  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # Ensures that a master key has been made available in ENV["RAILS_MASTER_KEY"], config/master.key, or an environment
+  # key such as config/credentials/production.key. This key is used to decrypt credentials (and other encrypted files).

   # config.require_master_key = true
 
   # config.require_master_key = true
 

-  # Disable serving static files from the `/public` folder by default since
-  # Apache or NGINX already handles this.
-  config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
+  # Enable static file serving from the `/public` folder (turn off if using NGINX/Apache for it).
+  config.public_file_server.enabled = true

 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = Terser.new
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = Terser.new


@@ -46,16 +45,26 @@ Rails.application.configure do
   # config.action_cable.url = "wss://example.com/cable"
   # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 
   # config.action_cable.url = "wss://example.com/cable"
   # config.action_cable.allowed_request_origins = [ "http://example.com", /http:\/\/example.*/ ]
 

+  # Assume all access to the app is happening through a SSL-terminating reverse proxy.
+  # Can be used together with config.force_ssl for Strict-Transport-Security and secure cookies.
+  # config.assume_ssl = true
+

   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 

-  # Include generic and useful information about system operation, but avoid logging too much
-  # information to avoid inadvertent exposure of personally identifiable information (PII).
-  config.log_level = :info
+  # Log to STDOUT by default
+  # config.logger = ActiveSupport::Logger.new($stdout)
+  #                                      .tap  { |logger| logger.formatter = Logger::Formatter.new }
+  #                                      .then { |logger| ActiveSupport::TaggedLogging.new(logger) }

 
   # Prepend all log lines with the following tags.
   config.log_tags = [:request_id]
 
 
   # Prepend all log lines with the following tags.
   config.log_tags = [:request_id]
 

+  # Info include generic and useful information about system operation, but avoids logging too much
+  # information to avoid inadvertent exposure of personally identifiable information (PII). If you
+  # want to log everything, set the level to "debug".
+  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
+

   # Use a different log path in production.
   config.paths["log"] = Settings.log_path if Settings.key?(:log_path)
 
   # Use a different log path in production.
   config.paths["log"] = Settings.log_path if Settings.key?(:log_path)
 


@@ -82,24 +91,16 @@ Rails.application.configure do
   # Don't log any deprecations.
   config.active_support.report_deprecations = false
 
   # Don't log any deprecations.
   config.active_support.report_deprecations = false
 

-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = Logger::Formatter.new
-
-  # Use a different logger for distributed setups.
-  # require "syslog/logger"
-  # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new "app-name")
-
-  if ENV["RAILS_LOG_TO_STDOUT"].present?
-    logger           = ActiveSupport::Logger.new($stdout)
-    logger.formatter = config.log_formatter
-    config.logger    = ActiveSupport::TaggedLogging.new(logger)
-  end
-

   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false unless Settings.status == "database_offline"
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false unless Settings.status == "database_offline"
 

-  # Enable autoloading of dependencies.
-  config.enable_dependency_loading = true
+  # Enable DNS rebinding protection and other `Host` header attacks.
+  # config.hosts = [
+  #   "example.com",     # Allow requests from example.com
+  #   /.*\.example\.com/ # Allow requests from subdomains like `www.example.com`
+  # ]
+  # Skip DNS rebinding protection for the default health check endpoint.
+  # config.host_authorization = { exclude: ->(request) { request.path == "/up" } }

 
   # Use delayed job to queue jobs in production.
   config.active_job.queue_adapter = :delayed_job
 
   # Use delayed job to queue jobs in production.
   config.active_job.queue_adapter = :delayed_job