[gentoo-commits] gentoo-x86 commit in dev-db/redis/files: redis.initd-4 redis-2.8.17-config.patch

[gentoo-commits] gentoo-x86 commit in dev-db/redis/files: redis.initd-4 redis-2.8.17-config.patch

[Alexys Jacob (ultrabug)]

ultrabug    14/12/02 15:33:37

  Modified:             redis.initd-4
  Added:                redis-2.8.17-config.patch
  Log:
  fix #529050
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

Revision  Changes    Path
1.2                  dev-db/redis/files/redis.initd-4

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis.initd-4?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis.initd-4?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis.initd-4?r1=1.1&r2=1.2

Index: redis.initd-4
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redis.initd-4	8 Oct 2014 09:46:26 -0000	1.1
+++ redis.initd-4	2 Dec 2014 15:33:37 -0000	1.2
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.1 2014/10/08 09:46:26 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.2 2014/12/02 15:33:37 ultrabug Exp $
 
 REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
 REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
@@ -9,10 +9,10 @@
 REDIS_TIMEOUT=${REDIS_TIMEOUT:-30}
 
 command=/usr/sbin/redis-server
-start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
-	--user ${REDIS_USER} --group ${REDIS_GROUP}"
-command_args="${REDIS_OPTS}"
 pidfile=${REDIS_PID:-/run/redis/redis.pid}
+start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile}
+	--chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}"
+command_args="${REDIS_OPTS}"
 
 depend() {
 	use net localmount logger



1.1                  dev-db/redis/files/redis-2.8.17-config.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.8.17-config.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.8.17-config.patch?rev=1.1&content-type=text/plain

Index: redis-2.8.17-config.patch
===================================================================
--- a/redis.conf	2014-12-02 16:22:38.722433643 +0100
+++ b/redis.conf	2014-12-02 16:22:16.252249350 +0100
@@ -38,7 +38,7 @@
 
 # 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 /run/redis/redis.pid
 
 # Accept connections on the specified port, default is 6379.
 # If port 0 is specified Redis will not listen on a TCP socket.
@@ -61,7 +61,7 @@
 # Examples:
 #
 # bind 192.168.1.100 10.0.0.1
-# 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
@@ -100,7 +100,7 @@
 # Specify the log file name. Also the empty string 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 ""
+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.
@@ -184,7 +184,7 @@
 # The Append Only File will also be created inside this directory.
 # 
 # Note that you must specify a directory here, not a file name.
-dir ./
+dir /var/lib/redis/
 
 ################################# REPLICATION #################################
 
@@ -403,6 +403,7 @@
 # output buffers (but this is not needed if the policy is 'noeviction').
 #
 # maxmemory <bytes>
+maxmemory 67108864
 
 # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
 # is reached. You can select among five behaviors: