about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-04-02 19:19:51 +0200
committerGitHub <noreply@github.com>2018-04-02 19:19:51 +0200
commit36eac8ba9011f225f7f949bbf1ca173832561f10 (patch)
tree595b759cc79e0bf76c3c40dd4adbd9150300f2a6
parent2c51bc0ca5a4c3a4bb140b4b40dabdda859ebb94 (diff)
Do not default SMTP verify mode to "peer", default to "none" (#6996)
-rw-r--r--lib/tasks/mastodon.rake6
1 files changed, 1 insertions, 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|