aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2007-12-13 12:36:13 +0000
committerfrancis <francis>2007-12-13 12:36:13 +0000
commit3b9786bbf3b7f3d44e6ce2eed45c5f2d01c85006 (patch)
tree4efe68782eb5c4f9d5e8e82a1884365b37075a44
parent342077d5ecff73f2eeb4c0b8a4894f9bc1236cae (diff)
Only use sendmail for mail delivery in dev and production, not in test.
-rw-r--r--config/environment.rb3
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/environments/production.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb
index 6382eeb7a..ccf4c9ed6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -87,7 +87,4 @@ end
# Domain for URLs (so can work for scripts, not just web pages)
ActionController::UrlWriter.default_url_options[:host] = MySociety::Config.get("DOMAIN", 'localhost:3000')
-# So that it queues the message if there is a temporary error
-ActionMailer::Base.delivery_method = :sendmail
-
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0589aa979..243eb489c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -19,3 +19,5 @@ config.action_view.debug_rjs = true
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false
+config.action_mailer.delivery_method = :sendmail # so is queued, rather than giving immediate errors
+
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb295b83f..22cd429cf 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -16,3 +16,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
+