From 2451ac49575c58391cbafcc14b5fabb2e48a4266 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 7 Oct 2010 14:20:31 -0700
Subject: [PATCH] moved the SMTP setting into app_config.yml
---
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 15d1fc2bba..d848ad4e99 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 => 'localhost:3000'}
+ config.action_mailer.delivery_method = :smtp
+ config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
config.action_mailer.smtp_settings = {
- :address => 'smtp.gmail.com',
- :port => 587,
- :domain => 'mail.joindiaspora.com',
- :authentication => 'plain',
- :user_name => 'diaspora-pivots@joindiaspora.com',
- :password => "xy289|]G+R*-kA",
+ :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],
:enable_starttls_auto => true
}
end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb13c1d1c1..6b081b1647 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 => 'pivots.joindiaspora.com'}
+ config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
config.action_mailer.smtp_settings = {
- :address => 'smtp.gmail.com',
- :port => 587,
- :domain => 'mail.joindiaspora.com',
- :authentication => 'plain',
- :user_name => 'diaspora-pivots@joindiaspora.com',
- :password => "xy289|]G+R*-kA",
+ :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],
:enable_starttls_auto => true
}
end
--
GitLab