From 97f058c6251c078f2265ff418a087c6bdb89bb01 Mon Sep 17 00:00:00 2001 From: ilya Date: Thu, 7 Oct 2010 17:00:38 -0700 Subject: moving to app config yml --- config/initializers/mailer_config.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config/initializers/mailer_config.rb') diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index 46535ef84..73928f740 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -4,14 +4,14 @@ Diaspora::Application.configure do 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 -- cgit v1.2.3