- better defaults in config (verbose is too noisy and rarely needed)

Changed files:
    redis.conf.patch -> 1.4

diff --git a/redis.conf.patch b/redis.conf.patch
index 0a2cbf2fd85afc5058baec33bbdf7798186a574f..830cac853ede54d7d14d07a914cbb07f532458aa 100644 (file)
--- a/redis.conf.patch
+++ b/redis.conf.patch
@@ -1,5 +1,5 @@
---- redis-2.0.0/redis.conf     2010-09-04 16:01:59.234209087 -0400
-+++ redis-2.0.2/redis.conf     2010-10-09 18:18:34.973195551 +0300
+--- redis-2.4.2/redis.conf~    2011-10-26 17:16:33.000000000 +0300
++++ redis-2.4.2/redis.conf     2012-06-26 18:50:51.478588041 +0300
 @@ -14,11 +14,11 @@
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -12,27 +12,51 @@
 -pidfile /var/run/redis.pid
 +pidfile /var/run/redis/redis.pid
  
- # Accept connections on the specified port, default is 6379
- port 6379
-@@ -26,7 +26,7 @@
+ # 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 @@
  # If you want you can bind a single interface, if the bind option is not
  # specified all the interfaces will listen for incoming connections.
  #
 -# bind 127.0.0.1
 +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
+@@ -37,7 +37,7 @@
+ # unixsocketperm 755
+ 
  # Close the connection after a client is idle for N seconds (0 to disable)
- timeout 300
-@@ -42,7 +42,7 @@
+-timeout 300
++timeout 10
+ 
+ # Set server verbosity to 'debug'
+ # it can be one of:
+@@ -45,12 +45,12 @@
+ # verbose (many rarely useful info, but not a mess like the debug level)
+ # notice (moderately verbose, what you want in production probably)
+ # warning (only very important / critical messages are logged)
+-loglevel verbose
++loglevel notice
+ 
  # Specify the log file name. Also 'stdout' can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
 -logfile stdout
 +logfile /var/log/redis/redis.log
  
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -65,7 +65,7 @@
  # Set the number of databases. The default database is DB 0, you can select
  # a different one on a per-connection basis using SELECT <dbid> where
-@@ -86,7 +86,7 @@
+ # dbid is a number between 0 and 'databases'-1
+-databases 16
++databases 1
+ 
+ ################################ SNAPSHOTTING  #################################
+ #
+@@ -104,7 +104,7 @@
  # Also the Append Only File will be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
@@ -41,7 +65,7 @@
  
  ################################# REPLICATION #################################
  
-@@ -220,7 +220,7 @@
+@@ -365,7 +365,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.