diff options
author | ilya <ilya@laptop.(none)> | 2010-10-08 03:54:19 +0400 |
---|---|---|
committer | ilya <ilya@laptop.(none)> | 2010-10-08 03:54:38 +0400 |
commit | ad348ed24cdff569a9ad38944dc5f06062c18dac (patch) | |
tree | 18ec4f090390325dd58eef56b9dae924ddc2a0f1 | |
parent | 9c59adee516d358804952073c94db68fc890a97c (diff) |
trying the mailer_condig
-rw-r--r-- | config/environments/development.rb | 12 | ||||
-rw-r--r-- | config/initializers/mailer_config.rb | 17 |
2 files changed, 17 insertions, 12 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index ee08a058f..80022947e 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -24,16 +24,4 @@ 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 => 'pivots.joindiaspora.com'} - 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", - :enable_starttls_auto => true - } end diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb new file mode 100644 index 000000000..46535ef84 --- /dev/null +++ b/config/initializers/mailer_config.rb @@ -0,0 +1,17 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3 or later. 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 => '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 |