Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorilya <ilya@laptop.(none)>2010-10-08 04:00:38 +0400
committerilya <ilya@laptop.(none)>2010-10-08 04:00:38 +0400
commit97f058c6251c078f2265ff418a087c6bdb89bb01 (patch)
tree6021b3380254b2ab7d6ef7f98355063730be7db7 /config/initializers/mailer_config.rb
parentad348ed24cdff569a9ad38944dc5f06062c18dac (diff)
moving to app config yml
Diffstat (limited to 'config/initializers/mailer_config.rb')
-rw-r--r--config/initializers/mailer_config.rb14
1 files changed, 7 insertions, 7 deletions
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