made openssl verify mode configurable for SMTP

This commit is contained in:
Jonne Hass 2011-09-14 20:55:29 +02:00
parent 91e649977c
commit 70a9f3fd94
2 changed files with 9 additions and 2 deletions

View file

@ -126,6 +126,11 @@ defaults: &defaults
# Automatically enable TLS? Ignored if smtp_authentication is set to none
smtp_starttls_auto: true
# OpenSSL verify mode used when connecting to a SMTP server with TLS.
# Set this to none if you have a self signed certificate, keep it empty (not '') for the default
# Possible values: none, peer, client_once, fail_if_no_peer_cert
smtp_openssl_verify_mode:
# Domain of smtp server.
# This should match the common name of the certificate
# the SMTP server sends. If he sends one

View file

@ -17,7 +17,8 @@ Diaspora::Application.configure do
:address => AppConfig[:smtp_address],
:port => AppConfig[:smtp_port],
:domain => AppConfig[:smtp_domain],
:enable_starttls_auto => false
:enable_starttls_auto => false,
:openssl_verify_mode => AppConfig[:smtp_openssl_verify_mode]
}
else
config.action_mailer.smtp_settings = {
@ -27,7 +28,8 @@ Diaspora::Application.configure do
:authentication => AppConfig[:smtp_authentication],
:user_name => AppConfig[:smtp_username],
:password => AppConfig[:smtp_password],
:enable_starttls_auto => AppConfig[:smtp_starttls_auto]
:enable_starttls_auto => AppConfig[:smtp_starttls_auto],
:openssl_verify_mode => AppConfig[:smtp_openssl_verify_mode]
}
end
end