diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-04-03 19:17:20 +0000 |
| commit | 6611100480c86c07972c1223e7231c136966e11d (patch) | |
| tree | d6ce7cf9568d13ba0dfc8ee32fd1335e0d053f43 /lib/tasks | |
| parent | 1f5bdd8445f6ba192618288504b74c1df7c09ea6 (diff) | |
| parent | d8d42179590db772cc5b1873385cba7e5afe20df (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/mastodon.rake | 6 |
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| |