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

symbolize smtp_authentication setting to conform to rails docs

Browse source
This commit is contained in:
Jonne Haß 2012-01-02 21:08:57 +01:00
parent 67b2af0da6
commit cc961d66e2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/application.yml.example
View file

@ -137,8 +137,8 @@ defaults: &defaults
# Set this to true if you want to use exim and sendmail # Set this to true if you want to use exim and sendmail
sendmail_exim_fix: false sendmail_exim_fix: false
# Authentication required to send mail. Use one of 'one', 'plain', # Authentication required to send mail. Use one of 'plain',
# 'login' or 'cram-md5'. Use 'none' if server does not support # 'login' or 'cram_md5'. Use 'none' if server does not support
# authentication # authentication
smtp_authentication: 'plain' smtp_authentication: 'plain'

2
config/initializers/mailer_config.rb
View file

@ -39,7 +39,7 @@ Diaspora::Application.configure do
:address => AppConfig[:smtp_address], :address => AppConfig[:smtp_address],
:port => AppConfig[:smtp_port], :port => AppConfig[:smtp_port],
:domain => AppConfig[:smtp_domain], :domain => AppConfig[:smtp_domain],
:authentication => AppConfig[:smtp_authentication], :authentication => AppConfig[:smtp_authentication].gsub('-', '_').to_s,
:user_name => AppConfig[:smtp_username], :user_name => AppConfig[:smtp_username],
:password => AppConfig[:smtp_password], :password => AppConfig[:smtp_password],
:enable_starttls_auto => AppConfig[:smtp_starttls_auto], :enable_starttls_auto => AppConfig[:smtp_starttls_auto],