nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
danielvincent 2010-10-07 14:22:10 -07:00
commit 1a8d4a603f
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
config/environments/development.rb
View file

@ -24,15 +24,15 @@ Diaspora::Application.configure do
config.active_support.deprecation = :log config.active_support.deprecation = :log
config.middleware.use MongoMapper::ClearDevMemory config.middleware.use MongoMapper::ClearDevMemory
#config.threadsafe! #config.threadsafe!
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
config.action_mailer.default_url_options = {:host => 'localhost:3000'} config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
:address => 'smtp.gmail.com', :address => APP_CONFIG[:smtp_address],
:port => 587, :port => APP_CONFIG[:smtp_port],
:domain => 'mail.joindiaspora.com', :domain => APP_CONFIG[:smtp_domain],
:authentication => 'plain', :authentication => APP_CONFIG[:smtp_authentication],
:user_name => 'diaspora-pivots@joindiaspora.com', :user_name => APP_CONFIG[:smtp_username],
:password => "xy289|]G+R*-kA", :password => APP_CONFIG[:smtp_password],
:enable_starttls_auto => true :enable_starttls_auto => true
} }
end end

14
config/environments/production.rb
View file

@ -49,14 +49,14 @@ Diaspora::Application.configure do
config.threadsafe! config.threadsafe!
config.action_mailer.delivery_method = :smtp 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 = { config.action_mailer.smtp_settings = {
:address => 'smtp.gmail.com', :address => APP_CONFIG[:smtp_address],
:port => 587, :port => APP_CONFIG[:smtp_port],
:domain => 'mail.joindiaspora.com', :domain => APP_CONFIG[:smtp_domain],
:authentication => 'plain', :authentication => APP_CONFIG[:smtp_authentication],
:user_name => 'diaspora-pivots@joindiaspora.com', :user_name => APP_CONFIG[:smtp_username],
:password => "xy289|]G+R*-kA", :password => APP_CONFIG[:smtp_password],
:enable_starttls_auto => true :enable_starttls_auto => true
} }
end end