summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-09-12 18:05:46 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-16 09:42:01 +0300
commita47f7767c7f2a33258002649a08689f03d4c01b8 (patch)
tree4aaee1296a17bc9acf7c33d0051d6ade1a942f76
parent4f3f3beebad2d3c1a1ee6b657d40d7c93d5bc1b6 (diff)
downloadgitlab-shell-a47f7767c7f2a33258002649a08689f03d4c01b8.tar.gz
Connect to Redis via sockets by default
-rw-r--r--CHANGELOG1
-rw-r--r--config.yml.example6
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c0e37f9..daf6d11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v2.0.0
- Handle invalid number of arguments on remote commands
- Replace update hook with pre-receive and post-receive hooks.
- Ignore missing repositories in create-hooks
+ - Connect to Redis via sockets by default
v1.9.7
- Increased test coverage
diff --git a/config.yml.example b/config.yml.example
index c9c5b41..94eb593 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -27,11 +27,11 @@ auth_file: "/home/git/.ssh/authorized_keys"
# Redis settings used for pushing commit notices to gitlab
redis:
bin: /usr/bin/redis-cli
- host: 127.0.0.1
- port: 6379
+ # host: 127.0.0.1
+ # 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
database: 0
+ socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP
namespace: resque:gitlab
# Log file.