diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2010-08-15 09:18:07 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2010-08-15 09:18:07 +0000 |
| commit | c345e328fb463e6544a0131c2500a340068e8afc (patch) | |
| tree | 2ad16c2bcde15579205175b879ad2c547f7c01ed /databases/redis-devel/files/patch-redis.conf | |
| parent | Handle yet another error case. (diff) | |
Update from 1.2.6 to latest development version 2.0.0rc4 after repocopy.
Add CONFLICTS.
Add the note in UPDATING about configuration file changes.
Notes
Notes:
svn path=/head/; revision=259281
Diffstat (limited to 'databases/redis-devel/files/patch-redis.conf')
| -rw-r--r-- | databases/redis-devel/files/patch-redis.conf | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/databases/redis-devel/files/patch-redis.conf b/databases/redis-devel/files/patch-redis.conf index 4aab6fedaf65..d105b89a9e95 100644 --- a/databases/redis-devel/files/patch-redis.conf +++ b/databases/redis-devel/files/patch-redis.conf @@ -1,32 +1,32 @@ ---- redis.conf.orig 2009-12-27 11:54:09.000000000 +0300 -+++ redis.conf 2009-12-27 11:56:16.000000000 +0300 -@@ -2,11 +2,11 @@ +--- redis.conf.orig 2010-07-02 16:00:49.000000000 +0400 ++++ redis.conf 2010-07-02 16:01:46.000000000 +0400 +@@ -14,11 +14,11 @@ # 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 - # When run as a daemon, Redis write a pid file in /var/run/redis.pid by default. - # You can specify a custom pid file location here. + # When running daemonized, Redis writes a pid file in /var/run/redis.pid by + # default. You can specify a custom pid file location here. -pidfile /var/run/redis.pid +pidfile %%REDIS_RUNDIR%%/redis.pid # Accept connections on the specified port, default is 6379 port 6379 -@@ -29,7 +29,7 @@ +@@ -42,7 +42,7 @@ # Specify the log file name. Also 'stdout' can be used to force - # the demon to log on the standard output. Note that if you use standard + # 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 %%REDIS_LOGDIR%%/redis.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 -@@ -64,7 +64,7 @@ - - # For default save/load DB in/from the working directory - # Note that you must specify a directory not a file name. +@@ -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 %%REDIS_DBDIR%%/ |