Merge remote-tracking branch 'osmlab/id-default'

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index e517d224540d65db2fdd244de4c4fdcbd6d336fa..824c11573f6d8408ae80bfe790429ca24a08726f 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -49,18 +49,20 @@ 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")
+    config.cache_store = :mem_cache_store, MemCache.new(:namespace => "rails:cache", :no_block => true, :buffer_requests => true, :noreply => true)

   end
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
   end
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # 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( map.js menu.js pngfix.js site.js swfobject.js )
-  config.assets.precompile += %w( openlayers.js )
+  config.assets.precompile += %w( index.js edit.js browse.js changeset.js welcome.js )
+  config.assets.precompile += %w( user.js diary_entry.js pngfix.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/default/style.css )
+  config.assets.precompile += %w( browse.css leaflet-all.css leaflet.ie.css )
+  config.assets.precompile += %w( embed.js embed.css )
+  config.assets.precompile += %w( iD.js iD.css )

 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false