From 2a104ea62240eab7b888a8b425be0436bffe0c15 Mon Sep 17 00:00:00 2001 From: ilya Date: Thu, 7 Oct 2010 14:26:59 -0700 Subject: [PATCH] Revert "moved the SMTP setting into app_config.yml" This reverts commit 2451ac49575c58391cbafcc14b5fabb2e48a4266. --- config/environments/development.rb | 16 ++++++++-------- config/environments/production.rb | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index d848ad4e9..15d1fc2bb 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -24,15 +24,15 @@ Diaspora::Application.configure do config.active_support.deprecation = :log config.middleware.use MongoMapper::ClearDevMemory #config.threadsafe! - config.action_mailer.delivery_method = :smtp - config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]} + config.action_mailer.delivery_method = :smtp + config.action_mailer.default_url_options = {:host => 'localhost:3000'} config.action_mailer.smtp_settings = { - :address => APP_CONFIG[:smtp_address], - :port => APP_CONFIG[:smtp_port], - :domain => APP_CONFIG[:smtp_domain], - :authentication => APP_CONFIG[:smtp_authentication], - :user_name => APP_CONFIG[:smtp_username], - :password => APP_CONFIG[:smtp_password], + :address => 'smtp.gmail.com', + :port => 587, + :domain => 'mail.joindiaspora.com', + :authentication => 'plain', + :user_name => 'diaspora-pivots@joindiaspora.com', + :password => "xy289|]G+R*-kA", :enable_starttls_auto => true } end diff --git a/config/environments/production.rb b/config/environments/production.rb index 6b081b164..cb13c1d1c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -49,14 +49,14 @@ Diaspora::Application.configure do config.threadsafe! config.action_mailer.delivery_method = :smtp - config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]} + config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'} config.action_mailer.smtp_settings = { - :address => APP_CONFIG[:smtp_address], - :port => APP_CONFIG[:smtp_port], - :domain => APP_CONFIG[:smtp_domain], - :authentication => APP_CONFIG[:smtp_authentication], - :user_name => APP_CONFIG[:smtp_username], - :password => APP_CONFIG[:smtp_password], + :address => 'smtp.gmail.com', + :port => 587, + :domain => 'mail.joindiaspora.com', + :authentication => 'plain', + :user_name => 'diaspora-pivots@joindiaspora.com', + :password => "xy289|]G+R*-kA", :enable_starttls_auto => true } end