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

fixed #747

Browse source
This commit is contained in:
MrZYX 2011-05-25 22:50:13 +02:00
parent 52487e87de
commit cf1d83878c
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/app.yml.example
View file

@ -61,6 +61,9 @@ default:
# authentication # authentication
smtp_authentication: 'plain' smtp_authentication: 'plain'
# Automatically enable TLS? Ignored if smtp_authentication is set to none
smtp_starttls_auto: true
# Credentails possibly required to log in to SMTP server if # Credentails possibly required to log in to SMTP server if
# smtp_authentication != 'none' # smtp_authentication != 'none'
smtp_username: 'smtp_username' smtp_username: 'smtp_username'

3
config/app_base.yml
View file

@ -61,6 +61,9 @@ default:
# authentication # authentication
smtp_authentication: 'plain' smtp_authentication: 'plain'
# Automatically enable TLS? Ignored if smtp_authentication is set to none
smtp_starttls_auto: true
# Credentails possibly required to log in to SMTP server if # Credentails possibly required to log in to SMTP server if
# smtp_authentication != 'none' # smtp_authentication != 'none'
smtp_username: 'smtp_username' smtp_username: 'smtp_username'

2
config/initializers/mailer_config.rb
View file

@ -27,7 +27,7 @@ Diaspora::Application.configure do
:authentication => AppConfig[:smtp_authentication], :authentication => AppConfig[:smtp_authentication],
:user_name => AppConfig[:smtp_username], :user_name => AppConfig[:smtp_username],
:password => AppConfig[:smtp_password], :password => AppConfig[:smtp_password],
:enable_starttls_auto => true :enable_starttls_auto => AppConfig[:smtp_starttls_auto]
} }
end end
end end