aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-02-15 11:58:41 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-02-15 11:58:41 +1100
commit64cb99eee83273cc9c70fa9094b75dc300026c84 (patch)
treef35a3ab786d8bc3eb5fe5c72277034de427f7407
parent759ce4d275f4c08a913f77822a88a096c54df94d (diff)
Oops. ssl configuration should be in production environment
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/environments/production.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 04680f17c..c43cdb049 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -27,5 +27,3 @@ config.action_mailer.smtp_settings = { :address => "localhost", :port => 1025 }
# unintentionally kept references to objects, especially strings.
# require 'memory_profiler'
# MemoryProfiler.start :string_debug => true, :delay => 10
-
-config.middleware.insert_after ActionController::Failsafe, "Rack::SSL" if ::Configuration::force_ssl
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 84a8f5965..0b3f5e9b3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -17,3 +17,5 @@ config.action_controller.perform_caching = true
# Disable delivery errors, bad email addresses will be ignored
# config.action_mailer.raise_delivery_errors = false
config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors
+
+config.middleware.insert_after ActionController::Failsafe, "Rack::SSL" if ::Configuration::force_ssl