Fix server error when user#reset_password called with no token

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 35222bd07ac011cceb41c3e38826e1e158adb9f8..3557d8d8b90a5e0bfbcca736a234ff5e2aceb3a3 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -58,9 +58,12 @@ OpenStreetMap::Application.configure do
 
   # Use a different cache store in production.
   if defined?(MEMCACHE_SERVERS)
 
   # Use a different cache store in production.
   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
 

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