2012-11-20 13:09:48 +01:00
|
|
|
--- redis.conf.orig 2012-07-31 16:56:02.000000000 +0200
|
|
|
|
|
+++ redis.conf 2012-07-31 16:59:31.000000000 +0200
|
|
|
|
|
@@ -14,11 +14,11 @@
|
2010-03-08 00:11:23 +01:00
|
|
|
|
|
|
|
|
# By default Redis does not run as a daemon. Use 'yes' if you need it.
|
|
|
|
|
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
|
|
|
|
|
-daemonize no
|
|
|
|
|
+daemonize yes
|
|
|
|
|
|
2011-02-24 23:52:08 +01:00
|
|
|
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by
|
|
|
|
|
# default. You can specify a custom pid file location here.
|
2012-11-20 13:09:48 +01:00
|
|
|
-pidfile /var/run/redis.pid
|
|
|
|
|
+pidfile /var/run/redis/default.pid
|
|
|
|
|
|
|
|
|
|
# Accept connections on the specified port, default is 6379.
|
|
|
|
|
# If port 0 is specified Redis will not listen on a TCP socket.
|
|
|
|
|
@@ -27,7 +27,7 @@
|
2011-01-10 15:11:05 +01:00
|
|
|
# If you want you can bind a single interface, if the bind option is not
|
2011-02-24 23:52:08 +01:00
|
|
|
# specified all the interfaces will listen for incoming connections.
|
2011-01-10 15:11:05 +01:00
|
|
|
#
|
|
|
|
|
-# bind 127.0.0.1
|
|
|
|
|
+bind 127.0.0.1
|
|
|
|
|
|
2011-02-24 23:52:08 +01:00
|
|
|
# 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
|
2012-11-20 13:09:48 +01:00
|
|
|
@@ -45,12 +45,12 @@
|
2011-02-24 23:52:08 +01:00
|
|
|
# verbose (many rarely useful info, but not a mess like the debug level)
|
2011-01-10 15:11:05 +01:00
|
|
|
# notice (moderately verbose, what you want in production probably)
|
|
|
|
|
# warning (only very important / critical messages are logged)
|
2011-02-24 23:52:08 +01:00
|
|
|
-loglevel verbose
|
2011-01-10 15:11:05 +01:00
|
|
|
+loglevel notice
|
|
|
|
|
|
|
|
|
|
# Specify the log file name. Also 'stdout' can be used to force
|
2011-02-24 23:52:08 +01:00
|
|
|
# Redis to log on the standard output. Note that if you use standard
|
2011-01-18 22:10:38 +01:00
|
|
|
# output for logging but daemonize, logs will be sent to /dev/null
|
|
|
|
|
-logfile stdout
|
2012-11-20 13:09:48 +01:00
|
|
|
+logfile /var/log/redis/default.log
|
2011-02-24 23:52:08 +01:00
|
|
|
|
|
|
|
|
# To enable logging to the system logger, just set 'syslog-enabled' to yes,
|
|
|
|
|
# and optionally update the other syslog parameters to suit your needs.
|
2012-11-20 13:09:48 +01:00
|
|
|
@@ -104,7 +104,7 @@
|
2011-02-24 23:52:08 +01:00
|
|
|
# Also the Append Only File will be created inside this directory.
|
|
|
|
|
#
|
|
|
|
|
# Note that you must specify a directory here, not a file name.
|
2010-03-08 00:22:27 +01:00
|
|
|
-dir ./
|
2012-11-20 13:09:48 +01:00
|
|
|
+dir /var/lib/redis/default/
|
2010-03-08 00:22:27 +01:00
|
|
|
|
|
|
|
|
################################# REPLICATION #################################
|
|
|
|
|
|
2012-11-20 13:09:48 +01:00
|
|
|
@@ -386,7 +386,7 @@
|
|
|
|
|
# *** WARNING *** if you are using a shared hosting the default of putting
|
|
|
|
|
# the swap file under /tmp is not secure. Create a dir with access granted
|
|
|
|
|
# only to Redis user and configure Redis to create the swap file there.
|
|
|
|
|
-vm-swap-file /tmp/redis.swap
|
|
|
|
|
+vm-swap-file /var/lib/redis/default/redis.swap
|
|
|
|
|
|
|
|
|
|
# vm-max-memory configures the VM to use at max the specified amount of
|
|
|
|
|
# RAM. Everything that deos not fit will be swapped on disk *if* possible, that
|
