diff options
author | ilya <ilya@laptop.(none)> | 2010-10-08 02:40:18 +0400 |
---|---|---|
committer | ilya <ilya@laptop.(none)> | 2010-10-08 02:40:18 +0400 |
commit | 720d1daa9ec66b4c6ecbb96e7f62d96edfec1fd1 (patch) | |
tree | 7e738626936dc1b19048607384a6170372e9e042 /config/initializers | |
parent | cda5efbee975ceb29f9c5da4c0e850ae99fcf397 (diff) |
moved the mailer settings back into env
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/mailer_config.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb deleted file mode 100644 index 4890422cf..000000000 --- a/config/initializers/mailer_config.rb +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2010, Diaspora Inc. This file is -# licensed under the Affero General Public License version 3. See -# the COPYRIGHT file. - -Diaspora::Application.configure do - config.action_mailer.delivery_method = :smtp - config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'} - config.action_mailer.smtp_settings = { - :address => 'pivots.joindiaspora.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 |