Gentoo Archives: gentoo-commits

From: "Alexys Jacob (ultrabug)" <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/redis/files: redis.initd-4 redis-2.8.17-config.patch
Date: Tue, 02 Dec 2014 15:33:41
Message-Id: 20141202153337.7EA60B5D1@oystercatcher.gentoo.org
1 ultrabug 14/12/02 15:33:37
2
3 Modified: redis.initd-4
4 Added: redis-2.8.17-config.patch
5 Log:
6 fix #529050
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
9
10 Revision Changes Path
11 1.2 dev-db/redis/files/redis.initd-4
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis.initd-4?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis.initd-4?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis.initd-4?r1=1.1&r2=1.2
16
17 Index: redis.initd-4
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- redis.initd-4 8 Oct 2014 09:46:26 -0000 1.1
24 +++ redis.initd-4 2 Dec 2014 15:33:37 -0000 1.2
25 @@ -1,5 +1,5 @@
26 #!/sbin/runscript
27 -# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.1 2014/10/08 09:46:26 ultrabug Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-4,v 1.2 2014/12/02 15:33:37 ultrabug Exp $
29
30 REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
31 REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
32 @@ -9,10 +9,10 @@
33 REDIS_TIMEOUT=${REDIS_TIMEOUT:-30}
34
35 command=/usr/sbin/redis-server
36 -start_stop_daemon_args="--chdir \"${REDIS_DIR}\"
37 - --user ${REDIS_USER} --group ${REDIS_GROUP}"
38 -command_args="${REDIS_OPTS}"
39 pidfile=${REDIS_PID:-/run/redis/redis.pid}
40 +start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile}
41 + --chdir \"${REDIS_DIR}\" --user ${REDIS_USER} --group ${REDIS_GROUP}"
42 +command_args="${REDIS_OPTS}"
43
44 depend() {
45 use net localmount logger
46
47
48
49 1.1 dev-db/redis/files/redis-2.8.17-config.patch
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.8.17-config.patch?rev=1.1&view=markup
52 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
53
54 Index: redis-2.8.17-config.patch
55 ===================================================================
56 --- a/redis.conf 2014-12-02 16:22:38.722433643 +0100
57 +++ b/redis.conf 2014-12-02 16:22:16.252249350 +0100
58 @@ -38,7 +38,7 @@
59
60 # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
61 # default. You can specify a custom pid file location here.
62 -pidfile /var/run/redis.pid
63 +pidfile /run/redis/redis.pid
64
65 # Accept connections on the specified port, default is 6379.
66 # If port 0 is specified Redis will not listen on a TCP socket.
67 @@ -61,7 +61,7 @@
68 # Examples:
69 #
70 # bind 192.168.1.100 10.0.0.1
71 -# bind 127.0.0.1
72 +bind 127.0.0.1
73
74 # Specify the path for the Unix socket that will be used to listen for
75 # incoming connections. There is no default, so Redis will not listen
76 @@ -100,7 +100,7 @@
77 # Specify the log file name. Also the empty string can be used to force
78 # Redis to log on the standard output. Note that if you use standard
79 # output for logging but daemonize, logs will be sent to /dev/null
80 -logfile ""
81 +logfile /var/log/redis/redis.log
82
83 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
84 # and optionally update the other syslog parameters to suit your needs.
85 @@ -184,7 +184,7 @@
86 # The Append Only File will also be created inside this directory.
87 #
88 # Note that you must specify a directory here, not a file name.
89 -dir ./
90 +dir /var/lib/redis/
91
92 ################################# REPLICATION #################################
93
94 @@ -403,6 +403,7 @@
95 # output buffers (but this is not needed if the policy is 'noeviction').
96 #
97 # maxmemory <bytes>
98 +maxmemory 67108864
99
100 # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
101 # is reached. You can select among five behaviors: