Don't show http-only routers to users on https

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

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0542b0ed8fdcc823a707bf9ce845baa3a5af01ce..36f71792f40e381d23f1f419a5778f8e08875a7b 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -58,21 +58,33 @@ 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"
 
   # Precompile additional assets.
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
   # 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 in app/assets folder are already added.

-  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( index.js browse.js welcome.js fixthemap.js routing.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 leaflet-all.css leaflet.ie.css )
+  config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )

   config.assets.precompile += %w( embed.js embed.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.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.
 
   # 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.