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

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

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


@@ -14,77 +16,91 @@ OpenStreetMap::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
 

-  # 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 either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true

 
 

-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # 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?

 
   # 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
 

-  # Generate digests for assets URLs.
-  config.assets.digest = true
+  # 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.*/ ]

 
   # 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
 

-  # Set to :debug to see everything in the log.
+  # 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
 
   # Prepend all log lines with the following tags.
   config.log_level = :info
 
   # 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.
 
   # Use a different log path in production.

-  if defined?(LOG_PATH)
-    config.paths["log"] = LOG_PATH
-  end
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+  config.paths["log"] = Settings.log_path if Settings.key?(:log_path)

 
   # Use a different cache store in production.
 
   # Use a different cache store in production.

-  if defined?(MEMCACHE_SERVERS)
-    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
-  end
+  # config.cache_store = :mem_cache_store

 
 

-  # Configure caching of static assets
-  config.action_controller.page_cache_directory = Rails.public_path
+  # 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"

 
 

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

 
 

-  # `config.assets.precompile` has moved to config/initializers/assets.rb
+  # Configure caching of static assets
+  config.action_controller.page_cache_directory = Rails.public_path

 
   # 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
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
 
   # 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
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to

-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).

   config.i18n.fallbacks = true
 
   config.i18n.fallbacks = true
 

-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
+  # Don't log any deprecations.
+  config.active_support.report_deprecations = false

 
   # Use default logging formatter so that PID and timestamp are not suppressed.
 
   # Use default logging formatter so that PID and timestamp are not suppressed.

-  config.log_formatter = ::Logger::Formatter.new
+  config.log_formatter = Logger::Formatter.new

 
 

-  # Do not dump schema after migrations.
-  unless STATUS == :database_offline
-    config.active_record.dump_schema_after_migration = false
+  # 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
   end

+
+  # 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
+
+  # Use delayed job to queue jobs in production.
+  config.active_job.queue_adapter = :delayed_job

 end
 end