Update to rails 4.1.1

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index fc728929a71665336b62e95fd98ed17c2724585e..9debf96668cc4de0d9a74ba86e03096a2e24d911 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,82 +1,108 @@
 OpenStreetMap::Application.configure do
 OpenStreetMap::Application.configure do

-  # Settings specified here will take precedence over those in config/application.rb
+  # 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 rack caching
-  config.action_dispatch.rack_cache = false
+  # 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

 
 

-  # Disable Rails's static asset server (Apache or nginx will already do this)
+  # Disable Rails's static asset server (Apache or nginx will already do this).

   config.serve_static_assets = false
 
   config.serve_static_assets = false
 

-  # 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
+  # Generate digests for assets URLs.

   config.assets.digest = true
 
   config.assets.digest = true
 

-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'

 
 

-  # 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
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # 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
+  # Set to :debug to see everything in the log.
+  config.log_level = :info

 
 

-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.

   # config.log_tags = [ :subdomain, :uuid ]
 
   # config.log_tags = [ :subdomain, :uuid ]
 

-  # Use a different log path in production
+  # Use a different log path in production.

   if defined?(LOG_PATH)
     config.paths["log"] = LOG_PATH
   end
 
   if defined?(LOG_PATH)
     config.paths["log"] = LOG_PATH
   end
 

-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.

   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 

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

   if defined?(MEMCACHE_SERVERS)
   if defined?(MEMCACHE_SERVERS)

-    config.cache_store = :mem_cache_store, MemCache.new(:namespace => "rails:cache", :no_block => true, :buffer_requests => true, :noreply => true)
+    config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }

   end
 
   end
 

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

-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w( index.js edit.js browse.js changeset.js )
-  config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+  config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
+  config.assets.precompile += %w( user.js diary_entry.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( 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 theme/openstreetmap/style.css )
-  config.assets.precompile += %w( leaflet.css leaflet.ie.css leaflet.draw.css leaflet.draw.ie.css )
-
-  # Disable delivery errors, bad email addresses will be ignored
+  config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
+  config.assets.precompile += %w( embed.js embed.css )
+  config.assets.precompile += %w( html5shiv.js )
+  config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
+  config.assets.precompile += %w( potlatch2.swf )
+  config.assets.precompile += %w( potlatch2/assets.zip )
+  config.assets.precompile += %w( potlatch2/FontLibrary.swf )
+  config.assets.precompile += %w( potlatch2/locales/*.swf )
+  config.assets.precompile += %w( help/introduction.* )
+  config.assets.precompile += %w( iD.js iD.css )
+  config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif )
+  config.assets.precompile += %w( iD/img/pattern/*.png )
+
+  # 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 can not 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
 

-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false

 end
 end