diff --git a/config/application.yml.example b/config/application.yml.example index b6cd0402402c1126af5abef253e0b37cfde1608a..0c75a02e2671f22fe11ac50174010b8dd9b02c83 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -137,8 +137,8 @@ defaults: &defaults # Set this to true if you want to use exim and sendmail sendmail_exim_fix: false - # Authentication required to send mail. Use one of 'one', 'plain', - # 'login' or 'cram-md5'. Use 'none' if server does not support + # Authentication required to send mail. Use one of 'plain', + # 'login' or 'cram_md5'. Use 'none' if server does not support # authentication smtp_authentication: 'plain' diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb index 4d81b00692491e5528b08c154f582c74d5a37802..5f611600f6ea36258692f64228fb5f6d98a53928 100644 --- a/config/initializers/mailer_config.rb +++ b/config/initializers/mailer_config.rb @@ -39,7 +39,7 @@ Diaspora::Application.configure do :address => AppConfig[:smtp_address], :port => AppConfig[:smtp_port], :domain => AppConfig[:smtp_domain], - :authentication => AppConfig[:smtp_authentication], + :authentication => AppConfig[:smtp_authentication].gsub('-', '_').to_s, :user_name => AppConfig[:smtp_username], :password => AppConfig[:smtp_password], :enable_starttls_auto => AppConfig[:smtp_starttls_auto],