Commit 57865ae2 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #141 from attiks/support-redis-password

added support for redis password
parents 3f365414 38af3f1e
...@@ -29,6 +29,7 @@ redis: ...@@ -29,6 +29,7 @@ redis:
bin: /usr/bin/redis-cli bin: /usr/bin/redis-cli
host: 127.0.0.1 host: 127.0.0.1
port: 6379 port: 6379
# pass: redispass # Allows you to specify the password for Redis
# socket: /tmp/redis.socket # Only define this if you want to use sockets # socket: /tmp/redis.socket # Only define this if you want to use sockets
namespace: resque:gitlab namespace: resque:gitlab
......
...@@ -52,9 +52,13 @@ class GitlabConfig ...@@ -52,9 +52,13 @@ class GitlabConfig
else else
if redis.has_key?("socket") if redis.has_key?("socket")
%W(#{redis['bin']} -s #{redis['socket']}) %W(#{redis['bin']} -s #{redis['socket']})
else
if redis.has_key?("pass")
%W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -a #{redis['pass']})
else else
%W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']}) %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']})
end end
end end
end end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment