From 36eac8ba9011f225f7f949bbf1ca173832561f10 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 2 Apr 2018 19:19:51 +0200
Subject: [PATCH] Do not default SMTP verify mode to "peer", default to "none"
(#6996)
---
lib/tasks/mastodon.rake | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index cfd6a1d25..505c7e0fa 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -256,11 +256,7 @@ namespace :mastodon do
q.modify :strip
end
- env['SMTP_OPENSSL_VERIFY_MODE'] = prompt.ask('SMTP OpenSSL verify mode:') do |q|
- q.required
- q.default 'peer'
- q.modify :strip
- end
+ env['SMTP_OPENSSL_VERIFY_MODE'] = prompt.select('SMTP OpenSSL verify mode:', %w(none peer client_once fail_if_no_peer_cert))
end
env['SMTP_FROM_ADDRESS'] = prompt.ask('E-mail address to send e-mails "from":') do |q|