summaryrefslogtreecommitdiff
path: root/lib/gitlab_config.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-12 16:20:39 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-12 16:20:39 +0000
commit4f3f3beebad2d3c1a1ee6b657d40d7c93d5bc1b6 (patch)
tree6f96e52365f963b2b894e2f3ec1baa8665e9027a /lib/gitlab_config.rb
parent00e30138af0ebec24255d08c5166cfd1faa28f6d (diff)
parent61307fd850e1c52d4761d3a193e3abaedc4f55f8 (diff)
downloadgitlab-shell-4f3f3beebad2d3c1a1ee6b657d40d7c93d5bc1b6.tar.gz
Merge branch 'defaults' into 'master'
Redis defaults See merge request !42
Diffstat (limited to 'lib/gitlab_config.rb')
-rw-r--r--lib/gitlab_config.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index ccd17ed..c97743b 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -55,6 +55,8 @@ class GitlabConfig
%W(env -i redis-cli)
else
redis['database'] ||= 0
+ redis['host'] ||= '127.0.0.1'
+ redis['port'] ||= '6379'
if redis.has_key?("socket")
%W(#{redis['bin']} -s #{redis['socket']} -n #{redis['database']})
else