- swap file in private dir

Changed files:
    redis.conf.patch -> 1.2

diff --git a/redis.conf.patch b/redis.conf.patch
index f3ae7842c1a617ecb3f922b73c952c435c14c48c..8b84b80e379b6f2daaf09eb1ad9f2ad500b9c6db 100644 (file)
--- a/redis.conf.patch
+++ b/redis.conf.patch
@@ -1,6 +1,5 @@
-diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf
---- redis-2.0.0/redis.conf.orig        2010-09-04 15:59:16.599206633 -0400
-+++ redis-2.0.0/redis.conf     2010-09-04 16:01:59.234209087 -0400
+--- 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
 @@ -14,11 +14,11 @@
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
@@ -15,7 +14,7 @@ diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf
  
  # Accept connections on the specified port, default is 6379
  port 6379
-@@ -26,7 +26,7 @@ port 6379
+@@ -26,7 +26,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.
  #
@@ -24,27 +23,30 @@ diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf
  
  # Close the connection after a client is idle for N seconds (0 to disable)
  timeout 300
-@@ -37,12 +37,12 @@ timeout 300
- # 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
- 
+@@ -42,7 +42,7 @@
  # 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
++logfile /var/log/redis/redis-server.log
  
  # 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 @@ dbfilename dump.rdb
+@@ -86,7 +86,7 @@
  # Also the Append Only File will be created inside this directory.
  # 
  # Note that you must specify a directory here, not a file name.
 -dir ./
-+dir /var/lib/redis/
++dir /var/lib/redis
  
  ################################# REPLICATION #################################
  
+@@ -220,7 +220,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/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