From a74ea7e80f87edde829f6e0190abac2be49d40d4 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Tue, 17 Aug 2010 15:31:14 -0700
Subject: [PATCH] Back to config actionmailer, the settings are getting set,
 try mail.joindiaspora.com

---
 config/environments/production.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 2481ad94a..bfc68495b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -44,17 +44,13 @@ Diaspora::Application.configure do
 
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
-  smtp_settings = {
+  config.action_mailer.smtp_settings = {
     :address => 'smtp.gmail.com',
     :port => 587,
-    :domain => 'joindiaspora.com',
+    :domain => 'mail.joindiaspora.com',
     :authentication => 'plain',
     :user_name => 'diaspora-pivots',
     :password => "xy289|]G+R*-kA",
     :enable_starttls_auto => true
   }
-
-  Mail.defaults do
-    delivery_method :smtp, smtp_settings
-  end
 end