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

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index ccba43daafd5df6a919dae258fac24d94a6c3254..9a7e072b4ec6889fc419dca02c3ca5912285d5a8 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,8 +1,10 @@
-OpenStreetMap::Application.configure do
+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.
   # 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


@@ -11,61 +13,80 @@ OpenStreetMap::Application.configure do
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.
   config.eager_load = true
 
   # Full error reports are disabled and caching is turned on.

-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false

   config.action_controller.perform_caching = true
 
   config.action_controller.perform_caching = true
 

-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like
-  # NGINX, varnish or squid.
-  # config.action_dispatch.rack_cache = true
+  # 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
+
+  # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
+  # config.public_file_server.enabled = false

 
 

-  # Disable serving static files from the `/public` folder by default since
-  # Apache or NGINX already handles this.
-  config.serve_static_files = ENV["RAILS_SERVE_STATIC_FILES"].present?
+  # Compress JavaScripts using a preprocessor.
+  config.assets.js_compressor = Terser.new

 
 

-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  # Compress CSS using a preprocessor.

   # config.assets.css_compressor = :sass
 
   # config.assets.css_compressor = :sass
 

-  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  # Do not fall back to assets pipeline if a precompiled asset is missed.

   config.assets.compile = false
 
   config.assets.compile = false
 

-  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
-  # yet still be able to expire them through the digest params.
-  config.assets.digest = true
-
-  # `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.
+  # 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).
+  config.active_storage.service = :local
+
+  # Mount Action Cable outside main process or domain.
+  # 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.*/ ]
+
+  # 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
+  # Skip http-to-https redirect for the default health check endpoint.
+  # config.ssl_options = { redirect: { exclude: ->(request) { request.path == "/up" } } }
+
+  # 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.
 
   # Prepend all log lines with the following tags.

-  # config.log_tags = [ :subdomain, :uuid ]
+  config.log_tags = [:request_id]

 
 

-  # Use a different log path in production.
-  config.paths["log"] = LOG_PATH if defined?(LOG_PATH)
+  # "info" includes 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 logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  # Use a different log path in production.
+  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).
+  # config.active_job.queue_adapter = :resque
+  # config.active_job.queue_name_prefix = "openstreetmap_production"
+
+  # Disable caching for Action Mailer templates even if Action Controller
+  # caching is enabled.
+  config.action_mailer.perform_caching = false
+

   # Configure caching of static assets
   config.action_controller.page_cache_directory = Rails.public_path
 
   # Configure caching of static assets
   config.action_controller.page_cache_directory = Rails.public_path
 

-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = 'http://assets.example.com'
-

   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false


@@ -74,14 +95,20 @@ OpenStreetMap::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
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false

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

-  unless STATUS == :database_offline
-    config.active_record.dump_schema_after_migration = false
-  end
+  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

 end
 end