From cc961d66e2c1c80c42fbebc56a3078703f1ba15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <mrzyx@mrzyx.de>
Date: Mon, 2 Jan 2012 21:08:57 +0100
Subject: [PATCH] symbolize smtp_authentication setting to conform to rails
docs
---
config/application.yml.example | 4 ++--
config/initializers/mailer_config.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/application.yml.example b/config/application.yml.example
index b6cd040240..0c75a02e26 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 4d81b00692..5f611600f6 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],
--
GitLab