Update to rails 5.1.4

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2e10a46a165906c82be39bd0198cf5ab20e8b975..c4c98ad48fc3de6a72bbbf830fac696e998cc5a8 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,71 +1,102 @@
-OpenStreetMap::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.

 
 

-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.

   config.cache_classes = true
 
   config.cache_classes = true
 

-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.

   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 

-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
+  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
+  # `config/secrets.yml.key`.
+  config.read_encrypted_secrets = 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?

 
 

-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass

 
 

-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.

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

-  # Generate digests for assets URLs
-  config.assets.digest = true
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb

 
 

-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'

 
 

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

-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :info

 
 

-  # Use a different log path in production
-  if defined?(LOG_PATH)
-    config.log_path = LOG_PATH
-  end
+  # Prepend all log lines with the following tags.
+  config.log_tags = [:request_id]

 
 

-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # Use a different log path in production.
+  config.paths["log"] = LOG_PATH if defined?(LOG_PATH)

 
 

-  # Use a different cache store in production
-  if defined?(MEMCACHE_SERVERS)
-    MEMCACHE = Memcached::Rails.new(MEMCACHE_SERVERS, :binary_protocol => true)
-    config.cache_store = :mem_cache_store, MEMCACHE
-  end
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store

 
 

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

 
 

-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w( map.js menu.js pngfix.js site.js swfobject.js )
-  config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
-  config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
-  config.assets.precompile += %w( browse.css )
+  # Configure caching of static assets
+  config.action_controller.page_cache_directory = Rails.public_path

 
 

-  # Disable delivery errors, bad email addresses will be ignored
+  # 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
 
   # config.action_mailer.raise_delivery_errors = false
 

-  # Enable threaded mode
-  # config.threadsafe!
-

   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # 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
+  # Send deprecation notices to registered listeners.

   config.active_support.deprecation = :notify
   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
+
+  # Do not dump schema after migrations.
+  unless STATUS == :database_offline
+    config.active_record.dump_schema_after_migration = false
+  end
+
+  # Enable autoloading of dependencies.
+  config.enable_dependency_loading = true

 end
 end