projects / packages / redis.git / blame
| Commit | Line | Data |
|---|---|---|
| 9702f891 ER |
1 | diff -up redis-2.0.0/redis.conf.orig redis-2.0.0/redis.conf |
| 2 | --- redis-2.0.0/redis.conf.orig 2010-09-04 15:59:16.599206633 -0400 | |
| 3 | +++ redis-2.0.0/redis.conf 2010-09-04 16:01:59.234209087 -0400 | |
| 4 | @@ -14,11 +14,11 @@ | |
| 5 | ||
| 6 | # By default Redis does not run as a daemon. Use 'yes' if you need it. | |
| 7 | # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. | |
| 8 | -daemonize no | |
| 9 | +daemonize yes | |
| 10 | ||
| 11 | # When running daemonized, Redis writes a pid file in /var/run/redis.pid by | |
| 12 | # default. You can specify a custom pid file location here. | |
| 13 | -pidfile /var/run/redis.pid | |
| 14 | +pidfile /var/run/redis/redis.pid | |
| 15 | ||
| 16 | # Accept connections on the specified port, default is 6379 | |
| 17 | port 6379 | |
| 18 | @@ -26,7 +26,7 @@ port 6379 | |
| 19 | # If you want you can bind a single interface, if the bind option is not | |
| 20 | # specified all the interfaces will listen for incoming connections. | |
| 21 | # | |
| 22 | -# bind 127.0.0.1 | |
| 23 | +bind 127.0.0.1 | |
| 24 | ||
| 25 | # Close the connection after a client is idle for N seconds (0 to disable) | |
| 26 | timeout 300 | |
| 27 | @@ -37,12 +37,12 @@ timeout 300 | |
| 28 | # verbose (many rarely useful info, but not a mess like the debug level) | |
| 29 | # notice (moderately verbose, what you want in production probably) | |
| 30 | # warning (only very important / critical messages are logged) | |
| 31 | -loglevel verbose | |
| 32 | +loglevel notice | |
| 33 | ||
| 34 | # Specify the log file name. Also 'stdout' can be used to force | |
| 35 | # Redis to log on the standard output. Note that if you use standard | |
| 36 | # output for logging but daemonize, logs will be sent to /dev/null | |
| 37 | -logfile stdout | |
| 38 | +logfile /var/log/redis/redis.log | |
| 39 | ||
| 40 | # Set the number of databases. The default database is DB 0, you can select | |
| 41 | # a different one on a per-connection basis using SELECT <dbid> where | |
| 42 | @@ -86,7 +86,7 @@ dbfilename dump.rdb | |
| 43 | # Also the Append Only File will be created inside this directory. | |
| 44 | # | |
| 45 | # Note that you must specify a directory here, not a file name. | |
| 46 | -dir ./ | |
| 47 | +dir /var/lib/redis/ | |
| 48 | ||
| 49 | ################################# REPLICATION ################################# | |
| 50 |