X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..a9b00e16e70707e398d475352d68ed9da86dec3b:/config/environments/production.rb diff --git a/config/environments/production.rb b/config/environments/production.rb index 9e15487ae..ca186492e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -29,8 +29,6 @@ Rails.application.configure do # 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. # config.action_controller.asset_host = 'http://assets.example.com' @@ -38,10 +36,10 @@ Rails.application.configure do # 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 + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = Settings.storage_service.to_sym - # 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.url = 'wss://example.com/cable' # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] @@ -57,14 +55,15 @@ Rails.application.configure do config.log_tags = [:request_id] # 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 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_name_prefix = "openstreetmap_#{Rails.env}" + # config.active_job.queue_name_prefix = "openstreetmap_production" + config.action_mailer.perform_caching = false # Configure caching of static assets @@ -74,10 +73,6 @@ Rails.application.configure do # 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 cannot be found). - config.i18n.fallbacks = true - # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify @@ -95,7 +90,28 @@ Rails.application.configure do end # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false unless STATUS == :database_offline + config.active_record.dump_schema_after_migration = false unless Settings.status == "database_offline" + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session # Enable autoloading of dependencies. config.enable_dependency_loading = true