summaryrefslogtreecommitdiff
path: root/lib/gitlab_config.rb
diff options
context:
space:
mode:
authorPeter <peter@attiks.com>2014-03-21 08:45:15 +0100
committerPeter <peter@attiks.com>2014-03-21 08:45:15 +0100
commit38af3f1e2fa517b208ab8fb1e37685af214a7a00 (patch)
tree62deb74fbee85f22b342491893025b788269c7f0 /lib/gitlab_config.rb
parentce88b74d52410250427116349d06a74359a65b48 (diff)
downloadgitlab-shell-38af3f1e2fa517b208ab8fb1e37685af214a7a00.tar.gz
added support for redis password
Diffstat (limited to 'lib/gitlab_config.rb')
-rw-r--r--lib/gitlab_config.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index ad15247..816da2c 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -53,7 +53,11 @@ class GitlabConfig
if redis.has_key?("socket")
%W(#{redis['bin']} -s #{redis['socket']})
else
- %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']})
+ if redis.has_key?("pass")
+ %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -a #{redis['pass']})
+ else
+ %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']})
+ end
end
end
end