Merge remote-tracking branch 'upstream/pull/4886'

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 9e15487ae4877fb80d9d1e0177958dbaee7efead..5ce25fc2c649e86f6cf5a03682d7fb24503b9eec 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+

 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.
 Rails.application.configure do
   # 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


@@ -14,57 +16,65 @@ 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.
 
   # Compress JavaScripts and CSS.

-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Terser.new

   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 

-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-

   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.

-  # config.action_controller.asset_host = 'http://assets.example.com'
+  # config.asset_host = "http://assets.example.com"

 
   # Specifies the header that your server uses for sending files.
 
   # Specifies the header that your server uses for sending files.

-  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for Apache
+  # config.action_dispatch.x_sendfile_header = "X-Accel-Redirect" # for NGINX

 
 

-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  # Store uploaded files on the local file system (see config/storage.yml for options).

   config.active_storage.service = :local
 
   config.active_storage.service = :local
 

-  # Mount Action Cable outside main process or domain
+  # Mount Action Cable outside main process or domain.

   # config.action_cable.mount_path = nil
   # config.action_cable.mount_path = nil

-  # 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
 

-  # Use the lowest log level to ensure availability of diagnostic information
-  # when problems arise.
-  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.
   # Use a different log path in production.

-  config.paths["log"] = LOG_PATH if defined?(LOG_PATH)
+  config.paths["log"] = Settings.log_path if Settings.key?(:log_path)

 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 

-  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # Use a real queuing backend for Active Job (and separate queues per environment).

   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_adapter     = :resque

-  # config.active_job.queue_name_prefix = "openstreetmap_#{Rails.env}"
+  # config.active_job.queue_name_prefix = "openstreetmap_production"
+

   config.action_mailer.perform_caching = false
 
   # Configure caching of static assets
   config.action_mailer.perform_caching = false
 
   # Configure caching of static assets


@@ -78,27 +88,19 @@ Rails.application.configure do
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 

-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # 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
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false

 
   # Do not dump schema after migrations.
 
   # Do not dump schema after migrations.

-  config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline
-
-  # Enable autoloading of dependencies.
-  config.enable_dependency_loading = true
+  config.active_record.dump_schema_after_migration = false unless Settings.status == "database_offline"
+
+  # 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