From: David Baucum <maxolasersquad@gmail.com>
Date: Sun, 22 Apr 2018 09:49:16 +0000 (-0400)
Subject: Ability to specify Redis passwd on mastodon:setup (#7222)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ca9192d9ba1c27689d7a14d0fb5b426c3d73c9f4;p=mastodon.git

Ability to specify Redis passwd on mastodon:setup (#7222)

Closes #7221
---

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 505c7e0fa..b5a148337 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -107,9 +107,16 @@ namespace :mastodon do
           q.convert :int
         end
 
+        env['REDIS_PASSWORD'] = prompt.ask('Redis password:') do |q|
+          q.required false
+          a.default nil
+          q.modify :strip
+        end
+
         redis_options = {
           host: env['REDIS_HOST'],
           port: env['REDIS_PORT'],
+          password: env['REDIS_PASSWORD'],
           driver: :hiredis,
         }