summaryrefslogtreecommitdiff
path: root/redis.conf
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2010-11-02 23:47:52 +0100
committerantirez <antirez@gmail.com>2010-11-02 23:47:52 +0100
commit0a546fc01758f9a9f8b2113764c2cf963df6ef20 (patch)
treefe857de13f213e587d85457a777a5d9b3e2f7cba /redis.conf
parent539fb43820592992c26dcb60d3901b503c6d9b77 (diff)
parentb04ce2a35ce084a043ef8749ca4fa0e62b92bd03 (diff)
downloadredis-0a546fc01758f9a9f8b2113764c2cf963df6ef20.tar.gz
Merge remote branch 'pietern/unixsocket'
Diffstat (limited to 'redis.conf')
-rw-r--r--redis.conf8
1 files changed, 7 insertions, 1 deletions
diff --git a/redis.conf b/redis.conf
index 8d69f9295..8ad5cc2e6 100644
--- a/redis.conf
+++ b/redis.conf
@@ -20,7 +20,7 @@ daemonize no
# default. You can specify a custom pid file location here.
pidfile /var/run/redis.pid
-# Accept connections on the specified port, default is 6379
+# Accept connections on the specified port, default is 6379.
port 6379
# If you want you can bind a single interface, if the bind option is not
@@ -28,6 +28,12 @@ port 6379
#
# bind 127.0.0.1
+# Specify the path for the unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/redis.sock
+
# Close the connection after a client is idle for N seconds (0 to disable)
timeout 300