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

made openssl verify mode configurable for SMTP

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/application.yml.example
View file

@ -126,6 +126,11 @@ defaults: &defaults
# Automatically enable TLS? Ignored if smtp_authentication is set to none # Automatically enable TLS? Ignored if smtp_authentication is set to none
smtp_starttls_auto: true 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. # Domain of smtp server.
# This should match the common name of the certificate # This should match the common name of the certificate
# the SMTP server sends. If he sends one # the SMTP server sends. If he sends one

6
config/initializers/mailer_config.rb
View file

@ -17,7 +17,8 @@ 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],
:enable_starttls_auto => false :enable_starttls_auto => false,
:openssl_verify_mode => AppConfig[:smtp_openssl_verify_mode]
} }
else else
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
@ -27,7 +28,8 @@ 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 => AppConfig[:smtp_starttls_auto] :enable_starttls_auto => AppConfig[:smtp_starttls_auto],
:openssl_verify_mode => AppConfig[:smtp_openssl_verify_mode]
} }
end end
end end