Merge pull request #2326 from opf/hotfix/check_smtp_no_authentication

allows 'none' as authentication mode
pull/2333/head
kgalli 10 years ago
commit 671ce216fa
  1. 9
      packaging/scripts/send-test-email

@ -27,14 +27,17 @@ if delivery_method == "sendmail"
File.open(tmpfile.path, "w+") {|f| f << msgstr}
system("cat #{tmpfile.path} | sendmail -i -t") || exit(1)
else
smtp_authentication = ENV.fetch('SMTP_AUTHENTICATION', "none").to_sym
#set authentication to nil because :none is not supported by SMTP module
smtp_authentication = nil if smtp_authentication == :none
puts "sending test email using SMTP..."
Net::SMTP.start(
ENV.fetch('SMTP_HOST'),
ENV.fetch('SMTP_PORT'),
ENV.fetch('SMTP_DOMAIN'),
ENV.fetch('SMTP_USERNAME'),
ENV.fetch('SMTP_PASSWORD'),
:login
ENV.fetch('SMTP_USERNAME',nil),
ENV.fetch('SMTP_PASSWORD',nil),
smtp_authentication
) do |smtp|
smtp.send_message msgstr, from, admin_email
end

Loading…
Cancel
Save