diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..526410a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/redis-3.2.4.tar.gz diff --git a/.rh-redis32-redis.metadata b/.rh-redis32-redis.metadata new file mode 100644 index 0000000..bb1b8b6 --- /dev/null +++ b/.rh-redis32-redis.metadata @@ -0,0 +1 @@ +f0fe685cbfdb8c2d8c74613ad8a5a5f33fba40c9 SOURCES/redis-3.2.4.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-redis-3.2-redis-conf.patch b/SOURCES/0001-redis-3.2-redis-conf.patch new file mode 100644 index 0000000..2803349 --- /dev/null +++ b/SOURCES/0001-redis-3.2-redis-conf.patch @@ -0,0 +1,36 @@ +diff -up ./redis.conf.rpmconf ./redis.conf +--- ./redis.conf.rpmconf 2015-12-23 13:35:32.000000000 +0100 ++++ ./redis.conf 2016-01-15 16:32:22.491355290 +0100 +@@ -140,7 +140,7 @@ loglevel notice + # 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. +@@ -224,7 +224,7 @@ dbfilename dump.rdb + # 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 ################################# + +diff -up ./sentinel.conf.rpmconf ./sentinel.conf +--- ./sentinel.conf.rpmconf 2015-12-23 13:35:32.000000000 +0100 ++++ ./sentinel.conf 2016-01-15 16:32:22.491355290 +0100 +@@ -4,6 +4,11 @@ + # The port that this sentinel instance will run on + port 26379 + ++# 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 /var/log/redis/sentinel.log ++ + # sentinel announce-ip + # sentinel announce-port + # diff --git a/SOURCES/0002-redis-3.2-deps-library-fPIC-performance-tuning.patch b/SOURCES/0002-redis-3.2-deps-library-fPIC-performance-tuning.patch new file mode 100644 index 0000000..acac994 --- /dev/null +++ b/SOURCES/0002-redis-3.2-deps-library-fPIC-performance-tuning.patch @@ -0,0 +1,36 @@ +diff -up ./deps/geohash-int/Makefile.pic ./deps/geohash-int/Makefile +--- ./deps/geohash-int/Makefile.pic 2016-01-15 16:47:38.818294577 +0100 ++++ ./deps/geohash-int/Makefile 2016-01-15 16:48:23.641486461 +0100 +@@ -2,7 +2,7 @@ STD= + WARN= -Wall + OPT= -O2 + +-R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC + R_LDFLAGS= $(LDFLAGS) + DEBUG= -g + +diff -up ./deps/linenoise/Makefile.pic ./deps/linenoise/Makefile +--- ./deps/linenoise/Makefile.pic 2015-12-23 13:35:32.000000000 +0100 ++++ ./deps/linenoise/Makefile 2016-01-15 16:44:52.561582851 +0100 +@@ -2,7 +2,7 @@ STD= + WARN= -Wall + OPT= -Os + +-R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC + R_LDFLAGS= $(LDFLAGS) + DEBUG= -g + +diff -up ./deps/Makefile.pic ./deps/Makefile +--- ./deps/Makefile.pic 2015-12-23 13:35:32.000000000 +0100 ++++ ./deps/Makefile 2016-01-15 16:44:52.561582851 +0100 +@@ -59,7 +59,7 @@ ifeq ($(uname_S),SunOS) + LUA_CFLAGS= -D__C99FEATURES__=1 + endif + +-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) ++LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS) -fPIC + LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier diff --git a/SOURCES/redis-limit-init b/SOURCES/redis-limit-init new file mode 100644 index 0000000..2986bfd --- /dev/null +++ b/SOURCES/redis-limit-init @@ -0,0 +1,6 @@ +# If you need to change max open file limit +# for example, when you change maxclient in configuration +# you can change the value below +# see "man limits.conf" for information +redis soft nofile 10240 +redis hard nofile 10240 diff --git a/SOURCES/redis-limit-systemd b/SOURCES/redis-limit-systemd new file mode 100644 index 0000000..8003c2f --- /dev/null +++ b/SOURCES/redis-limit-systemd @@ -0,0 +1,7 @@ +# If you need to change max open file limit +# for example, when you change maxclient in configuration +# you can change the LimitNOFILE value below +# see "man systemd.exec" for information + +[Service] +LimitNOFILE=10240 diff --git a/SOURCES/redis-pr3491.patch b/SOURCES/redis-pr3491.patch new file mode 100644 index 0000000..6c52694 --- /dev/null +++ b/SOURCES/redis-pr3491.patch @@ -0,0 +1,649 @@ +From 8295483fcee6c1232ac801ff91f66e21f9d23d80 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 8 Sep 2016 14:51:15 +0200 +Subject: [PATCH] 1st man pageis for - redis-cli - redis-benchmark - + redis-check-aof - redis-check-rdb - redis-server - redis.conf + +as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked) +redis.conf can also be used for sentinel.conf +--- + man/man1/redis-benchmark.1 | 132 ++++++++++++++++++++++++++++++++++ + man/man1/redis-check-aof.1 | 60 ++++++++++++++++ + man/man1/redis-check-rdb.1 | 53 ++++++++++++++ + man/man1/redis-cli.1 | 171 +++++++++++++++++++++++++++++++++++++++++++++ + man/man1/redis-server.1 | 117 +++++++++++++++++++++++++++++++ + man/man5/redis.conf.5 | 57 +++++++++++++++ + 6 files changed, 590 insertions(+) + create mode 100644 man/man1/redis-benchmark.1 + create mode 100644 man/man1/redis-check-aof.1 + create mode 100644 man/man1/redis-check-rdb.1 + create mode 100644 man/man1/redis-cli.1 + create mode 100644 man/man1/redis-server.1 + create mode 100644 man/man5/redis.conf.5 + +diff --git a/man/man1/redis-benchmark.1 b/man/man1/redis-benchmark.1 +new file mode 100644 +index 0000000..a3e4c62 +--- /dev/null ++++ b/man/man1/redis-benchmark.1 +@@ -0,0 +1,132 @@ ++.TH REDIS-BENCHMARK 1 "2016" "Redis" "User commands" ++.SH NAME ++redis\-benchmark \- Redis benchmark ++ ++.SH SYNOPSIS ++.B redis\-benchmark ++[ options ] ++.LP ++ ++.SH DESCRIPTION ++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store, ++used as database, cache and message broker, found at ++.B http://redis.io/ ++ ++The \fBredis\-benchmark\fP command is a command to benchmark redis-server. ++ ++.SH OPTIONS ++.TP 15 ++.B \-h \fIhostname\fP ++Server hostname (default: 127.0.0.1). ++.TP ++.B \-p \fIport\fP ++Server port (default: 6379). ++.TP ++.B \-s \fIsocket\fP ++Server socket (overrides hostname and port). ++.TP ++.B \-a \fIpassword\fP ++Password to use when connecting to the server. ++.TP ++.B \-c \fIclients\fP ++Number of parallel connections (default 50) ++.TP ++.B \-dnnum \fIdb\fP ++SELECT the specified db number (default 0) ++.TP ++.B \-k \fIboolean\fP ++1=keep alive 0=reconnect (default 1) ++.TP ++.B \-r \fIkeyspacelen\fP ++Use random keys for SET/GET/INCR, random values for SADD ++Using this option the benchmark will expand the string __rand_int__ ++inside an argument with a 12 digits number in the specified range ++from 0 to keyspacelen-1. The substitution changes every time a command ++is executed. Default tests use this to hit random keys in the ++specified range. ++.TP ++.B \-P \fInumreq\fP ++Pipeline requests. Default 1 (no pipeline). ++.TP ++.B \-e ++If server replies with errors, show them on stdout. ++(no more than 1 error per second is displayed) ++.TP ++.B \-q ++Quiet. Just show query/sec values ++.TP ++.B \-\-csv ++Output in CSV format ++.TP ++.B \-l ++Loop. Run the tests forever ++.TP ++.B \-t \fItests\fP ++Only run the comma separated list of tests. The test ++names are the same as the ones produced as output. ++.TP ++.B \-I ++Idle mode. Just open N idle connections and wait. ++ ++.SH EXAMPLES ++.TP 5 ++Run the benchmark with the default configuration against 127.0.0.1:6379: ++$ redis\-benchmark ++.TP ++Use 20 parallel clients, for a total of 100k requests, against 192.168.1.1: ++$ redis-benchmark \-h 192.168.1.1 \-p 6379 \-n 100000 \-c 20 ++.TP ++Fill 127.0.0.1:6379 with about 1 million keys only using the SET test: ++$ redis\-benchmark \-t set \-n 1000000 \-r 100000000 ++.TP ++Benchmark 127.0.0.1:6379 for a few commands producing CSV output: ++$ redis\-benchmark \-t ping,set,get \-n 100000 \-\-csv ++.TP ++Benchmark a specific command line: ++$ redis\-benchmark \-r 10000 \-n 10000 eval 'return redis.call("ping")' 0 ++.TP ++Fill a list with 10000 random elements: ++$ redis\-benchmark \-r 10000 \-n 10000 lpush mylist __rand_int__ ++.TP ++On user specified command lines __rand_int__ is replaced with a random integer ++with a range of values selected by the -r option. ++ ++ ++.SH BUGS ++See: ++.PD 0 ++.B http://redis.io/support ++and ++.B https://github.com/antirez/redis/issues ++ ++.SH COPYRIGHT ++Copyright \(co 2006\-2016 ++Salvatore Sanfilippo ++.P ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++.TP 2 ++* ++Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++.TP ++* ++Redistributions in binary form must reproduce the above copyright ++notice, this list of conditions and the following disclaimer in the ++documentation and/or other materials provided with the distribution. ++.TP ++* ++Neither the name of Redis nor the names of its contributors may be used ++to endorse or promote products derived from this software without specific ++prior written permission. ++.P ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +diff --git a/man/man1/redis-check-aof.1 b/man/man1/redis-check-aof.1 +new file mode 100644 +index 0000000..1569fd9 +--- /dev/null ++++ b/man/man1/redis-check-aof.1 +@@ -0,0 +1,60 @@ ++.TH REDIS-CHECK-AOF 1 "2016" "Redis" "User commands" ++.SH NAME ++redis\-check\-aof \- Redis AOF file checker and repairer ++ ++.SH SYNOPSIS ++.B redis\-check\-aof ++[\-\-fix] ++.IR file.aof ++ ++.SH DESCRIPTION ++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store, ++used as database, cache and message broker, found at ++.B http://redis.io/ ++ ++The \fBredis\-check\-aof\fP command to check or repair redis-server AOF files. ++ ++.SH OPTIONS ++.TP 15 ++.B \-\-fix ++Fix the file ++ ++ ++.SH BUGS ++See: ++.PD 0 ++.B http://redis.io/support ++and ++.B https://github.com/antirez/redis/issues ++ ++.SH COPYRIGHT ++Copyright \(co 2006\-2016 ++Salvatore Sanfilippo ++.P ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++.TP 2 ++* ++Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++.TP ++* ++Redistributions in binary form must reproduce the above copyright ++notice, this list of conditions and the following disclaimer in the ++documentation and/or other materials provided with the distribution. ++.TP ++* ++Neither the name of Redis nor the names of its contributors may be used ++to endorse or promote products derived from this software without specific ++prior written permission. ++.P ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +diff --git a/man/man1/redis-check-rdb.1 b/man/man1/redis-check-rdb.1 +new file mode 100644 +index 0000000..0e798ab +--- /dev/null ++++ b/man/man1/redis-check-rdb.1 +@@ -0,0 +1,53 @@ ++.TH REDIS-CHECK-RDB 1 "2016" "Redis" "User commands" ++.SH NAME ++redis\-check\-aof \- Redis RDB file checker ++ ++.SH SYNOPSIS ++.B redis\-check\-aof ++.IR file.rdb ++ ++.SH DESCRIPTION ++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store, ++used as database, cache and message broker, found at ++.B http://redis.io/ ++ ++The \fBredis\-check\-rdb\fP command to check redis-server RDB files. ++ ++.SH BUGS ++See: ++.PD 0 ++.B http://redis.io/support ++and ++.B https://github.com/antirez/redis/issues ++ ++.SH COPYRIGHT ++Copyright \(co 2006\-2016 ++Salvatore Sanfilippo ++.P ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++.TP 2 ++* ++Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++.TP ++* ++Redistributions in binary form must reproduce the above copyright ++notice, this list of conditions and the following disclaimer in the ++documentation and/or other materials provided with the distribution. ++.TP ++* ++Neither the name of Redis nor the names of its contributors may be used ++to endorse or promote products derived from this software without specific ++prior written permission. ++.P ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +diff --git a/man/man1/redis-cli.1 b/man/man1/redis-cli.1 +new file mode 100644 +index 0000000..14f84df +--- /dev/null ++++ b/man/man1/redis-cli.1 +@@ -0,0 +1,171 @@ ++.TH REDIS-CLI 1 "2016" "Redis" "User commands" ++.SH NAME ++redis\-cli \- Redis client ++ ++.SH SYNOPSIS ++.B redis\-cli ++[ options ] [cmd [arg [arg ...]]] ++.LP ++ ++.SH DESCRIPTION ++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store, ++used as database, cache and message broker, found at ++.B http://redis.io/ ++ ++The \fBredis-cli\fP command is a command line client to redis-server. ++ ++.SH OPTIONS ++.TP 15 ++.B \-h \fIhostname\fP ++Server hostname (default: 127.0.0.1). ++.TP ++.B \-p \fIport\fP ++Server port (default: 6379). ++.TP ++.B \-s \fIsocket\fP ++Server socket (overrides hostname and port). ++.TP ++.B \-a \fIpassword\fP ++Password to use when connecting to the server. ++.TP ++.B \-r \fIrepeat\fP ++Execute specified command N times. ++.TP ++.B \-i \fIinterval\fP ++When -r is used, waits \fIinterval\fP seconds per command. ++It is possible to specify sub-second times like -i 0.1. ++.TP ++.B \-n \fIdb\fP ++Database number. ++.TP ++.B \-x ++Read last argument from STDIN. ++.TP ++.B \-d \fIdelimiter\fP ++Multi-bulk delimiter in for raw formatting (default: \n). ++.TP ++.B \-c ++Enable cluster mode (follow -ASK and -MOVED redirections). ++.TP ++.B \-\-raw ++Use raw formatting for replies (default when STDOUT is not a tty). ++.TP ++.B \-\-no\-raw ++Force formatted output even when STDOUT is not a tty. ++.TP ++.B \-\-csv ++Output in CSV format. ++.TP ++.B \-\-stat ++Print rolling stats about server: mem, clients, ... ++.TP ++.B \-\-latency ++Enter a special mode continuously sampling latency. ++.TP ++.B \-\-latency\-history ++Like \-\-latency but tracking latency changes over time. ++Default time interval is 15 sec. Change it using -i. ++.TP ++.B \-\-latency\-dist ++Shows latency as a spectrum, requires xterm 256 colors. ++Default time interval is 1 sec. Change it using -i. ++.TP ++.B \-\-lru\-test ++Simulate a cache workload with an 80-20 distribution. ++.TP ++.B \-\-slave ++Simulate a slave showing commands received from the master. ++.TP ++.B \-\-rdb \fIfilename\fP ++Transfer an RDB dump from remote server to local file. ++.TP ++.B \-\-pipe ++Transfer raw Redis protocol from stdin to server. ++.TP ++.B \-\-pipe-timeout \fIn\fP ++In --pipe mode, abort with error if after sending all data. ++no reply is received within \fIn\fP seconds. ++Default timeout: 30. Use 0 to wait forever. ++.TP ++.B \-\-bigkeys ++Sample Redis keys looking for big keys. ++.TP ++.B \-\-scan ++List all keys using the SCAN command. ++.TP ++.B \-\-pattern \fIpat\fP ++Useful with --scan to specify a SCAN pattern. ++.TP ++.B \-\-intrinsic-latency \fIsec\fP ++Run a test to measure intrinsic system latency. ++The test will run for the specified amount of seconds. ++.TP ++.B \-\-eval \fIfile\fP ++Send an EVAL command using the Lua script at \fIfile\fP. ++.TP ++.B \-\-ldb ++Used with --eval enable the Redis Lua debugger. ++.TP ++.B \-\-ldb-sync-mode ++Like --ldb but uses the synchronous Lua debugger, in ++this mode the server is blocked and script changes are ++are not rolled back from the server memory. ++.TP ++.B \-\-help ++Output this help and exit. ++.TP ++.B \-\-version ++Output version and exit. ++ ++.SH EXAMPLES ++.TP ++cat /etc/passwd | redis-cli -x set mypasswd ++.TP ++redis-cli get mypasswd ++.TP ++redis-cli \-r 100 lpush mylist x ++.TP ++redis-cli \-r 100 \-i 1 info | grep used_memory_human: ++.TP ++redis-cli \-\-eval myscript.lua key1 key2 , arg1 arg2 arg3 ++.TP ++redis-cli \-\-scan \-\-pattern '*:12345*' ++ ++.SH BUGS ++See: ++.PD 0 ++.B http://redis.io/support ++and ++.B https://github.com/antirez/redis/issues ++ ++.SH COPYRIGHT ++Copyright \(co 2006\-2016 ++Salvatore Sanfilippo ++.P ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++.TP 2 ++* ++Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++.TP ++* ++Redistributions in binary form must reproduce the above copyright ++notice, this list of conditions and the following disclaimer in the ++documentation and/or other materials provided with the distribution. ++.TP ++* ++Neither the name of Redis nor the names of its contributors may be used ++to endorse or promote products derived from this software without specific ++prior written permission. ++.P ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +diff --git a/man/man1/redis-server.1 b/man/man1/redis-server.1 +new file mode 100644 +index 0000000..d6edd25 +--- /dev/null ++++ b/man/man1/redis-server.1 +@@ -0,0 +1,117 @@ ++.TH REDIS-SERVER 1 "2016" "Redis" "User commands" ++.SH NAME ++redis\-server, redis\-sentinel \- Redis server ++ ++.SH SYNOPSIS ++.B redis\-server ++[ ++.IR configuration_file ++] [ options ] [ \-\-sentinel ] ++.LP ++.B redis\-sentinel ++[ ++.IR configuration_file ++] [ options ] ++ ++ ++.SH DESCRIPTION ++\fBRedis\fP is an open source (BSD licensed), in-memory data structure store, ++used as database, cache and message broker, found at ++.B http://redis.io/ ++.LP ++The \fBredis\-server\fP command is a command line to launch a Redis server. ++.LP ++The \fBredis\-sentinel\fP command is a symbolic link to the \fBredis\-server\fP ++command which imply the \fB\-\-sentionel\fP option. ++ ++.SH OPTIONS ++.TP 15 ++.B \- ++Read configuration from stdin. ++.TP ++.TP 15 ++.B \-\-sentinel ++Run in sentinel mode ++.TP ++.B \-\-test-memory \fImegabytes\fP ++Run a memory check and exit. ++.TP ++.PD 0 ++.B \-\-help ++.TP ++.PD 1 ++.B \-h ++Output this help and exit. ++.TP ++.PD 0 ++.B \-\-version ++.TP ++.PD 1 ++.B \-v ++Output version and exit. ++.P ++All parameters described in \fBredis.conf\fR file can be passed as ++command line option, e.g. ++.B \-\-port ++.IR port ++. ++ ++.SH EXAMPLES ++.TP 5 ++Run the server with default conf ++redis-server ++.TP ++Run the server with a configuration file ++redis-server /etc/redis/6379.conf ++.TP ++Run the server changing some default options ++redis-server --port 7777 --slaveof 127.0.0.1 8888 ++.TP ++Run the server with a configuration file and changing some options ++redis-server /etc/myredis.conf --loglevel verbose ++.TP ++Run in sentinel mode ++redis-server /etc/sentinel.conf --sentinel ++ ++.SH "SEE ALSO" ++.PP ++\fBredis.conf\fR(5) ++ ++.SH BUGS ++See: ++.PD 0 ++.B http://redis.io/support ++and ++.B https://github.com/antirez/redis/issues ++ ++.SH COPYRIGHT ++Copyright \(co 2006\-2016 ++Salvatore Sanfilippo ++.P ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++.TP 2 ++* ++Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++.TP ++* ++Redistributions in binary form must reproduce the above copyright ++notice, this list of conditions and the following disclaimer in the ++documentation and/or other materials provided with the distribution. ++.TP ++* ++Neither the name of Redis nor the names of its contributors may be used ++to endorse or promote products derived from this software without specific ++prior written permission. ++.P ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +diff --git a/man/man5/redis.conf.5 b/man/man5/redis.conf.5 +new file mode 100644 +index 0000000..1e0c9c9 +--- /dev/null ++++ b/man/man5/redis.conf.5 +@@ -0,0 +1,57 @@ ++.TH REDIS.CONF 5 "2016" "Redis" "Configuration files" ++.SH NAME ++redis.conf, sentinel.conf - redis server configuration files. ++ ++.SH PARAMETERS ++.TP ++All empty lines or lines beginning with '#' are ignored. ++.TP ++See inline comments for parameters description. ++ ++.SH DESCRIPTION ++.TP ++\fBredis-server\fP read the configuration file passed as first argument. ++ ++.SH "SEE ALSO" ++.PP ++\fBredis\-server\fR(1) ++ ++ ++.SH BUGS ++See: ++.PD 0 ++.B http://redis.io/support ++and ++.B https://github.com/antirez/redis/issues ++ ++.SH COPYRIGHT ++Copyright \(co 2006\-2016 ++Salvatore Sanfilippo ++.P ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++.TP 2 ++* ++Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++.TP ++* ++Redistributions in binary form must reproduce the above copyright ++notice, this list of conditions and the following disclaimer in the ++documentation and/or other materials provided with the distribution. ++.TP ++* ++Neither the name of Redis nor the names of its contributors may be used ++to endorse or promote products derived from this software without specific ++prior written permission. ++.P ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED ++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; ++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/SOURCES/redis-pr3494.patch b/SOURCES/redis-pr3494.patch new file mode 100644 index 0000000..e45ccb9 --- /dev/null +++ b/SOURCES/redis-pr3494.patch @@ -0,0 +1,22 @@ +From a34f7b1ac2cfb2879cc0889da0297aee96bcb076 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 9 Sep 2016 17:23:27 +0200 +Subject: [PATCH] install redis-check-rdb as a symlink instead of duplicating + the binary + +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 6bd8d8d..4cc422e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -269,6 +269,6 @@ install: all + $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) + $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) + $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) +- $(REDIS_INSTALL) $(REDIS_CHECK_RDB_NAME) $(INSTALL_BIN) + $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) ++ @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) diff --git a/SOURCES/redis-sentinel.init b/SOURCES/redis-sentinel.init new file mode 100644 index 0000000..12cf278 --- /dev/null +++ b/SOURCES/redis-sentinel.init @@ -0,0 +1,97 @@ +#!/bin/sh +# +# redis init file for starting up the redis-sentinel daemon +# +# chkconfig: - 21 79 +# description: Starts and stops the redis-sentinel daemon. +# +### BEGIN INIT INFO +# Provides: redis-sentinel +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Short-Description: start and stop Sentinel server +# Description: A persistent key-value database +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +name="redis-sentinel" +exec="/usr/bin/$name" +shut="/usr/libexec/redis-shutdown" +pidfile="/var/run/redis/sentinel.pid" +SENTINEL_CONFIG="/etc/redis-sentinel.conf" + +[ -e /etc/sysconfig/redis-sentinel ] && . /etc/sysconfig/redis-sentinel + +lockfile=/var/lock/subsys/redis + +start() { + [ -f $SENTINEL_CONFIG ] || exit 6 + [ -x $exec ] || exit 5 + echo -n $"Starting $name: " + daemon --user ${REDIS_USER-redis} "$exec $SENTINEL_CONFIG --daemonize yes --pidfile $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $name: " + [ -x $shut ] && $shut $name + retval=$? + if [ -f $pidfile ] + then + # shutdown haven't work, try old way + killproc -p $pidfile $name + retval=$? + else + success "$name shutdown" + fi + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +rh_status() { + status -p $pidfile $name +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + reload|force-reload) + exit 3 + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" + exit 2 +esac +exit $? diff --git a/SOURCES/redis-sentinel.service b/SOURCES/redis-sentinel.service new file mode 100644 index 0000000..47b3e53 --- /dev/null +++ b/SOURCES/redis-sentinel.service @@ -0,0 +1,13 @@ +[Unit] +Description=Redis Sentinel +After=network.target + +[Service] +ExecStart=/usr/bin/redis-sentinel /etc/redis-sentinel.conf --daemonize no +ExecStop=/usr/libexec/redis-shutdown redis-sentinel +User=redis +Group=redis + +[Install] +WantedBy=multi-user.target + diff --git a/SOURCES/redis-shutdown b/SOURCES/redis-shutdown new file mode 100644 index 0000000..57f21af --- /dev/null +++ b/SOURCES/redis-shutdown @@ -0,0 +1,35 @@ +#!/bin/bash +# +# Wrapper to close properly redis and sentinel +test x"$REDIS_DEBUG" != x && set -x + +REDIS_CLI=/usr/bin/redis-cli + +# Retrieve service name +SERVICE_NAME="$1" +if [ -z "$SERVICE_NAME" ]; then + SERVICE_NAME=redis +fi + +# Get the proper config file based on service name +CONFIG_FILE="/etc/$SERVICE_NAME.conf" + +# Use awk to retrieve host, port from config file +HOST=`awk '/^[[:blank:]]*bind/ { print $2 }' $CONFIG_FILE | tail -n1` +PORT=`awk '/^[[:blank:]]*port/ { print $2 }' $CONFIG_FILE | tail -n1` +PASS=`awk '/^[[:blank:]]*requirepass/ { print $2 }' $CONFIG_FILE | tail -n1` + +# Just in case, use default host, port +HOST=${HOST:-127.0.0.1} +if [ "$SERVICE_NAME" = redis ]; then + PORT=${PORT:-6379} +else + PORT=${PORT:-26739} +fi + +# Setup additional parameters +# e.g password-protected redis instances +[ -z "$PASS" ] || ADDITIONAL_PARAMS="-a $PASS" + +# shutdown the service properly +$REDIS_CLI -h $HOST -p $PORT $ADDITIONAL_PARAMS shutdown diff --git a/SOURCES/redis.init b/SOURCES/redis.init new file mode 100644 index 0000000..960a4a6 --- /dev/null +++ b/SOURCES/redis.init @@ -0,0 +1,97 @@ +#!/bin/sh +# +# redis init file for starting up the redis daemon +# +# chkconfig: - 20 80 +# description: Starts and stops the redis daemon. +# +### BEGIN INIT INFO +# Provides: redis-server +# Required-Start: $local_fs $remote_fs $network +# Required-Stop: $local_fs $remote_fs $network +# Short-Description: start and stop Redis server +# Description: A persistent key-value database +### END INIT INFO + +# Source function library. +. /etc/rc.d/init.d/functions + +name="redis-server" +exec="/usr/bin/$name" +shut="/usr/libexec/redis-shutdown" +pidfile="/var/run/redis/redis.pid" +REDIS_CONFIG="/etc/redis.conf" + +[ -e /etc/sysconfig/redis ] && . /etc/sysconfig/redis + +lockfile=/var/lock/subsys/redis + +start() { + [ -f $REDIS_CONFIG ] || exit 6 + [ -x $exec ] || exit 5 + echo -n $"Starting $name: " + daemon --user ${REDIS_USER-redis} "$exec $REDIS_CONFIG --daemonize yes --pidfile $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $name: " + [ -x $shut ] && $shut + retval=$? + if [ -f $pidfile ] + then + # shutdown haven't work, try old way + killproc -p $pidfile $name + retval=$? + else + success "$name shutdown" + fi + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +rh_status() { + status -p $pidfile $name +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + reload|force-reload) + exit 3 + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}" + exit 2 +esac +exit $? diff --git a/SOURCES/redis.logrotate b/SOURCES/redis.logrotate new file mode 100644 index 0000000..3a3d185 --- /dev/null +++ b/SOURCES/redis.logrotate @@ -0,0 +1,9 @@ +/var/log/redis/*.log { + weekly + rotate 10 + copytruncate + delaycompress + compress + notifempty + missingok +} diff --git a/SOURCES/redis.service b/SOURCES/redis.service new file mode 100644 index 0000000..0e4eed0 --- /dev/null +++ b/SOURCES/redis.service @@ -0,0 +1,13 @@ +[Unit] +Description=Redis persistent key-value database +After=network.target + +[Service] +ExecStart=/usr/bin/redis-server /etc/redis.conf --daemonize no +ExecStop=/usr/libexec/redis-shutdown +User=redis +Group=redis + +[Install] +WantedBy=multi-user.target + diff --git a/SPECS/redis.spec b/SPECS/redis.spec new file mode 100644 index 0000000..feefa9c --- /dev/null +++ b/SPECS/redis.spec @@ -0,0 +1,677 @@ +# RHSCL spec file for redis, adapted for SCL from: +# +# Fedora spec file for redis +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please preserve changelog entries +# +%global _hardened_build 1 + +%if 0%{?scl:1} +%scl_package redis +%else +%global pkg_name %{name} +%global _root_sysconfdir %{_sysconfdir} +%global _root_initddir %{_initddir} +%global _root_libexecdir %{_libexecdir} +%endif + +# systemd >= 204 with additional service config +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%global with_systemd 1 +%else +%global with_systemd 0 +%endif + +# Tests fail in mock, not in local build. +%global with_tests %{?_with_tests:1}%{!?_with_tests:0} + +Name: %{scl_prefix}redis +Version: 3.2.4 +Release: 1%{?dist} +Summary: A persistent key-value database + +Group: Applications/Databases +License: BSD +URL: http://redis.io +Source0: http://download.redis.io/releases/%{pkg_name}-%{version}.tar.gz +Source1: %{pkg_name}.logrotate +Source2: %{pkg_name}.init +Source3: %{pkg_name}.service +Source5: %{pkg_name}-sentinel.init +Source6: %{pkg_name}-sentinel.service +Source7: %{pkg_name}-shutdown +Source8: %{pkg_name}-limit-systemd +Source9: %{pkg_name}-limit-init + +# Update configuration for RPM +Patch0: 0001-redis-3.2-redis-conf.patch +Patch1: 0002-redis-3.2-deps-library-fPIC-performance-tuning.patch + +# https://github.com/antirez/redis/pull/3491 - man pages +Patch3: %{pkg_name}-pr3491.patch +# https://github.com/antirez/redis/pull/3494 - symlink +Patch4: %{pkg_name}-pr3494.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: tcl >= 8.5 + +# Required for redis-shutdown +Requires: /bin/awk +Requires: logrotate +Requires(pre): shadow-utils +%if %{with_systemd} +BuildRequires: systemd-units +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +%else +Requires(post): chkconfig +Requires(preun): chkconfig +Requires(preun): initscripts +Requires(postun): initscripts +%endif + + +%description +Redis is an advanced key-value store. It is often referred to as a data +structure server since keys can contain strings, hashes, lists, sets and +sorted sets. + +You can run atomic operations on these types, like appending to a string; +incrementing the value in a hash; pushing to a list; computing set +intersection, union and difference; or getting the member with highest +ranking in a sorted set. + +In order to achieve its outstanding performance, Redis works with an +in-memory dataset. Depending on your use case, you can persist it either +by dumping the dataset to disk every once in a while, or by appending +each command to a log. + +Redis also supports trivial-to-setup master-slave replication, with very +fast non-blocking first synchronization, auto-reconnection on net split +and so forth. + +Other features include Transactions, Pub/Sub, Lua scripting, Keys with a +limited time-to-live, and configuration settings to make Redis behave like +a cache. + +You can use Redis from most programming languages also. + +Documentation: http://redis.io/documentation + + +%prep +%setup -q -n %{pkg_name}-%{version} + +%patch0 -p1 -b .rpmconf +%patch1 -p1 -b .pic + +%patch3 -p1 +%patch4 -p1 -b .pr3494 + +# No hidden build. +sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile +sed -i -e 's|$(QUIET_CC)||g' src/Makefile +sed -i -e 's|$(QUIET_LINK)||g' src/Makefile +sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile +# Ensure deps are built with proper flags +sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile +sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile +sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile +sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/linenoise/Makefile +sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/linenoise/Makefile + + +%build +export CFLAGS="$RPM_OPT_FLAGS" +make %{?_smp_mflags} V=1 \ + DEBUG="" \ + LDFLAGS="%{?__global_ldflags}" \ + CFLAGS="$RPM_OPT_FLAGS -fPIC" \ + LUA_CFLAGS="-fPIC" \ + MALLOC=jemalloc \ + all + +%check +%if %{with_tests} +make test +make test-sentinel +%else +: Test disabled, missing '--with tests' option. +%endif + +%install +make install PREFIX=%{buildroot}%{_prefix} +# Install misc other +install -p -D -m 644 %{SOURCE1} %{buildroot}%{_root_sysconfdir}/logrotate.d/%{name} +sed -e 's:/var:%{_localstatedir}:' -i %{buildroot}%{_root_sysconfdir}/logrotate.d/%{name} + +sed -e 's:/var:%{_localstatedir}:' -i %{pkg_name}.conf sentinel.conf +install -p -D -m 644 %{pkg_name}.conf %{buildroot}%{_sysconfdir}/%{pkg_name}.conf +install -p -D -m 644 sentinel.conf %{buildroot}%{_sysconfdir}/%{pkg_name}-sentinel.conf +install -d -m 750 %{buildroot}%{_localstatedir}/lib/%{pkg_name} +install -d -m 750 %{buildroot}%{_localstatedir}/log/%{pkg_name} + +%if %{with_systemd} +# Install systemd unit +sed -e 's:/usr/bin:%{_bindir}:;s:/var:%{_localstatedir}:;s:/etc:%{_sysconfdir}:;s:/usr/libexec:%{_libexecdir}:' \ + %{SOURCE3} >tmp_file +install -p -D -m 644 tmp_file %{buildroot}%{_unitdir}/%{name}.service +sed -e 's:/usr/bin:%{_bindir}:;s:/var:%{_localstatedir}:;s:/etc:%{_sysconfdir}:;s:/usr/libexec:%{_libexecdir}:' \ + %{SOURCE6} >tmp_file +install -p -D -m 644 tmp_file %{buildroot}%{_unitdir}/%{name}-sentinel.service +# this folder requires systemd >= 204 +install -p -D -m 644 %{SOURCE8} %{buildroot}%{_root_sysconfdir}/systemd/system/%{name}.service.d/limit.conf +install -p -D -m 644 %{SOURCE8} %{buildroot}%{_root_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf + +%else +install -d -m 750 %{buildroot}%{_localstatedir}/run/%{pkg_name} +sed -e 's:/usr/bin:%{_bindir}:;s:/var:%{_localstatedir}:;/redis/s:/etc:%{_sysconfdir}:;s:/usr/libexec:%{_libexecdir}:' \ + %{SOURCE2} >tmp_file +install -p -D -m 755 tmp_file %{buildroot}%{_root_initddir}/%{name} +sed -e 's:/usr/bin:%{_bindir}:;s:/var:%{_localstatedir}:;/redis/s:/etc:%{_sysconfdir}:;s:/usr/libexec:%{_libexecdir}:' \ + %{SOURCE5} >tmp_file +install -p -D -m 755 tmp_file %{buildroot}%{_root_initddir}/%{name}-sentinel +install -p -D -m 644 %{SOURCE9} %{buildroot}%{_root_sysconfdir}/security/limits.d/95-%{name}.conf +%endif + +# Fix non-standard-executable-perm error +chmod 755 %{buildroot}%{_bindir}/%{pkg_name}-* + +# Install redis-shutdown +sed -e 's:/usr/bin:%{_bindir}:;s:/var:%{_localstatedir}:;s:/etc:%{_sysconfdir}:' \ + %{SOURCE7} >tmp_file +install -pDm755 tmp_file %{buildroot}%{_libexecdir}/%{pkg_name}-shutdown + +rm tmp_file + +# Install man pages +man=$(dirname %{buildroot}%{_mandir}) +for page in man/man?/*; do + install -Dpm644 $page $man/$page +done +ln -s redis-server.1 %{buildroot}%{_mandir}/man1/redis-sentinel.1 +ln -s redis.conf.5 %{buildroot}%{_mandir}/man5/redis-sentinel.conf.5 + +%if 0%{?nfsmountable:1} +install -d -m 750 %{buildroot}%{_scl_scripts}/register.content%{_localstatedir}/lib/%{pkg_name} +install -d -m 750 %{buildroot}%{_scl_scripts}/register.content%{_localstatedir}/log/%{pkg_name} + + +install -D -m 644 %{buildroot}%{_root_sysconfdir}/logrotate.d/%{name} \ + %{buildroot}%{_scl_scripts}/register.content%{_root_sysconfdir}/logrotate.d/%{name} + +install -D -m 644 %{buildroot}%{_sysconfdir}/%{pkg_name}.conf \ + %{buildroot}%{_scl_scripts}/register.content%{_sysconfdir}/%{pkg_name}.conf +install -D -m 644 %{buildroot}%{_sysconfdir}/%{pkg_name}-sentinel.conf \ + %{buildroot}%{_scl_scripts}/register.content%{_sysconfdir}/%{pkg_name}-sentinel.conf + +%if %{with_systemd} +install -p -D -m 644 %{buildroot}%{_unitdir}/%{name}.service \ + %{buildroot}%{_scl_scripts}/register.content%{_unitdir}/%{name}.service +install -p -D -m 644 %{buildroot}%{_unitdir}/%{name}-sentinel.service \ + %{buildroot}%{_scl_scripts}/register.content%{_unitdir}/%{name}-sentinel.service + +%else +install -d -m 750 %{buildroot}%{_scl_scripts}/register.content%{_localstatedir}/run/%{pkg_name} +install -p -D -m 755 %{buildroot}%{_root_initddir}/%{name} \ + %{buildroot}%{_scl_scripts}/register.content%{_root_initddir}/%{name} +install -p -D -m 755 %{buildroot}%{_root_initddir}/%{name}-sentinel \ + %{buildroot}%{_scl_scripts}/register.content%{_root_initddir}/%{name}-sentinel +%endif +%endif + + +%post +%if 0%{?systemd_post:1} +%systemd_post %{name}.service +%systemd_post %{name}-sentinel.service +%else +# Initial installation (always, for new service) +/sbin/chkconfig --add %{name} +/sbin/chkconfig --add %{name}-sentinel +%endif + +%pre +getent group redis &> /dev/null || \ +groupadd -r redis &> /dev/null +getent passwd redis &> /dev/null || \ +useradd -r -g redis -d %{_sharedstatedir}/redis -s /sbin/nologin \ + -c 'Redis Server' redis &> /dev/null +exit 0 + +%preun +%if 0%{?systemd_preun:1} +%systemd_preun %{name}.service +%systemd_preun %{name}-sentinel.service +%else +if [ $1 = 0 ]; then + # Package removal, not upgrade + /sbin/service %{name}-sentinel stop &> /dev/null + /sbin/chkconfig --del %{name}-sentinel &> /dev/null + + /sbin/service %{name} stop &> /dev/null + /sbin/chkconfig --del %{name} &> /dev/null +fi +%endif + +%postun +%if 0%{?systemd_postun_with_restart:1} +%systemd_postun_with_restart %{name}.service +%systemd_postun_with_restart %{name}-sentinel.service +%else +if [ $1 -ge 1 ]; then + /sbin/service %{name} condrestart >/dev/null 2>&1 || : + /sbin/service %{name}-sentinel condrestart >/dev/null 2>&1 || : +fi +%endif + + +%files +%defattr(-,root,root,-) +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md +%config(noreplace) %{_root_sysconfdir}/logrotate.d/%{name} +%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{pkg_name}.conf +%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{pkg_name}-sentinel.conf +%dir %attr(0750, redis, redis) %{_localstatedir}/lib/%{pkg_name} +%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{pkg_name} +%{_bindir}/%{pkg_name}-* +%{_libexecdir}/%{pkg_name}-shutdown +%{_mandir}/man1/%{pkg_name}* +%{_mandir}/man5/%{pkg_name}* + +%if %{with_systemd} +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}-sentinel.service +%dir %{_root_sysconfdir}/systemd/system/%{name}.service.d +%config(noreplace) %{_root_sysconfdir}/systemd/system/%{name}.service.d/limit.conf +%dir %{_root_sysconfdir}/systemd/system/%{name}-sentinel.service.d +%config(noreplace) %{_root_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf + +%else +%dir %attr(0750, redis, redis) %{_localstatedir}/run/%{pkg_name} +%{_root_initddir}/%{name} +%{_root_initddir}/%{name}-sentinel +%config(noreplace) %{_root_sysconfdir}/security/limits.d/95-%{name}.conf +%endif + +%if 0%{?nfsmountable:1} +%dir %{_scl_scripts}/register.content%{_root_sysconfdir}/logrotate.d + %{_scl_scripts}/register.content%{_root_sysconfdir}/logrotate.d/%{name} +%dir %{_scl_scripts}/register.content%{_sysconfdir} + %attr(0640, redis, root) %{_scl_scripts}/register.content%{_sysconfdir}/%{pkg_name}.conf + %attr(0640, redis, root) %{_scl_scripts}/register.content%{_sysconfdir}/%{pkg_name}-sentinel.conf +%dir %{_scl_scripts}/register.content%{_localstatedir} +%dir %{_scl_scripts}/register.content%{_localstatedir}/lib +%dir %attr(0750, redis, redis) %{_scl_scripts}/register.content%{_localstatedir}/lib/%{pkg_name} +%dir %{_scl_scripts}/register.content%{_localstatedir}/log +%dir %attr(0750, redis, redis) %{_scl_scripts}/register.content%{_localstatedir}/log/%{pkg_name} +%dir %{_scl_scripts}/register.content%{_localstatedir} +%if %{with_systemd} +%dir %{_scl_scripts}/register.content%{_unitdir} + %{_scl_scripts}/register.content%{_unitdir}/%{name}.service + %{_scl_scripts}/register.content%{_unitdir}/%{name}-sentinel.service +%else +%dir %attr(0750, redis, redis) %{_scl_scripts}/register.content%{_localstatedir}/run/%{pkg_name} +%dir %{_scl_scripts}/register.content%{_root_initddir} + %{_scl_scripts}/register.content%{_root_initddir}/%{name} + %{_scl_scripts}/register.content%{_root_initddir}/%{name}-sentinel +%endif +%endif + + +%changelog +* Tue Oct 25 2016 Remi Collet - 3.2.4-1 +- rebase to 3.2.4 #1379378 +- fix init scripts (reload|force-reload) #1369495 + +* Wed Sep 14 2016 Remi Collet - 3.2.3-3 +- move redis-shutdown to libexec #1375922 +- add LSB headers to init scripts #1369495 + +* Mon Sep 12 2016 Remi Collet - 3.2.3-2 +- provide redis-check-rdb as a symlink to redis-server + add patch from https://github.com/antirez/redis/pull/3494 +- data and configuration should not be publicly readable #1374717 +- remove /var/run/redis with systemd +- add man pages from https://github.com/antirez/redis/pull/3491 #1369821 + +* Thu Sep 8 2016 Remi Collet - 3.2.3-1 +- rebase to 3.2.3 #1368102 +- fix redis-shutdown script +- init script doesn't support load/force-reload option #1369495 + +* Wed Jul 27 2016 Remi Collet - 3.2.1-1 +- adapt for RHSCL 2.3.0 + +* Fri Jun 24 2016 Remi Collet - 3.2.1-2 +- fix %%postun scriptlet, thanks Matthias) + +* Mon Jun 20 2016 Remi Collet - 3.2.1-1 +- Redis 3.2.1 - Release date: Fri Jun 17 15:01:56 CEST 2016 +- Upgrade urgency HIGH: Critical fix to Redis Sentinel, + due to 3.2.0 regression compared to 3.0. + +* Tue May 10 2016 Remi Collet - 3.2.0-1 +- update to 3.2.0 + +* Mon Feb 8 2016 Haïkel Guémar - 3.2-0.4.rc3 +- Fix redis-shutdown to handle password-protected instances shutdown + +* Thu Jan 28 2016 Remi Collet - 3.2-0.3.rc3 +- update to 3.2-rc3 (version 3.1.103) + +* Tue Jan 26 2016 Remi Collet - 3.2-0.2.rc2 +- update to 3.2-rc2 (version 3.1.102) + +* Fri Jan 15 2016 Remi Collet - 3.2-0.1.rc1 +- update to 3.2-rc1 (version 3.1.101) + This is the first release candidate of Redis 3.2 + +* Sat Dec 26 2015 Remi Collet - 3.0.6-1 +- Redis 3.0.6 - Release date: 18 Dec 2015 +- Upgrade urgency: MODERATE + +* Fri Oct 16 2015 Remi Collet - 3.0.5-1 +- Redis 3.0.5 - Release date: 15 Oct 2015 +- Upgrade urgency: MODERATE + +* Thu Sep 10 2015 Remi Collet - 3.0.4-1 +- Redis 3.0.4 - Release date: 8 Sep 2015 +- Upgrade urgency: HIGH for Redis and Sentinel. + +* Wed Aug 5 2015 Remi Collet - 3.0.3-1.1 +- make redis-shutdown more robust, see #22 + +* Fri Jul 17 2015 Remi Collet - 3.0.3-1 +- Redis 3.0.3 - Release date: 17 Jul 2015 +- Upgrade urgency: LOW for Redis and Sentinel. + +* Tue Jun 9 2015 Remi Collet - 3.0.2-1 +- Redis 3.0.2 - Release date: 4 Jun 2015 +- Upgrade urgency: HIGH for Redis because of a security issue. + LOW for Sentinel. + +* Wed May 6 2015 Remi Collet - 3.0.1-1 +- Redis 3.0.1 - Release date: 5 May 2015 +- Upgrade urgency: LOW for Redis and Cluster, MODERATE for Sentinel. + +* Tue Apr 14 2015 Remi Collet - 3.0.0-2 +- rebuild with new redis-shutdown from rawhide +- improved description from rawhide +- use redis/redis owner for directories under /var + +* Mon Apr 6 2015 Remi Collet - 3.0.0-1 +- Redis 3.0.0 - Release date: 1 Apr 2015 + +* Thu Mar 26 2015 Haïkel Guémar - 2.8.19-2 +- Fix redis-shutdown on multiple NIC setup (RHBZ #1201237) + +* Wed Dec 17 2014 Remi Collet - 2.8.19-1 +- Redis 2.8.19 - Release date: 16 Dec 2014 + upgrade urgency: LOW for both Redis and Sentinel. + +* Sat Dec 13 2014 Remi Collet - 2.8.18-2 +- provides /etc/systemd/system/redis.service.d/limit.conf + and /etc/systemd/system/redis-sentinel.service.d/limit.conf + or /etc/security/limits.d/95-redis.conf + +* Thu Dec 4 2014 Remi Collet - 2.8.18-1.1 +- EL-5 rebuild with upstream patch + +* Thu Dec 4 2014 Remi Collet - 2.8.18-1 +- Redis 2.8.18 - Release date: 4 Dec 2014 + upgrade urgency: LOW for both Redis and Sentinel. +- fix isfinite missing on EL-5 + +* Sun Sep 21 2014 Remi Collet - 2.8.17-2 +- fix sentinel service unit file for systemd +- also use redis-shutdown in init scripts + +* Sat Sep 20 2014 Remi Collet - 2.8.17-1 +- Redis 2.8.17 - Release date: 19 Sep 2014 + upgrade urgency: HIGH for Redis Sentinel, LOW for Redis Server. + +* Wed Sep 17 2014 Remi Collet - 2.8.16-1 +- Redis 2.8.16 - Release date: 16 Sep 2014 + upgrade urgency: HIGH for Redis, LOW for Sentinel. + +* Fri Sep 12 2014 Remi Collet - 2.8.15-1 +- Redis 2.8.15 - Release date: 12 Sep 2014 + upgrade urgency: LOW for Redis, HIGH for Sentinel. +- move commands from /usr/sbin to /usr/bin +- add redis-shutdown command (systemd) + +* Thu Sep 4 2014 Remi Collet - 2.8.14-1 +- Redis 2.8.14 - Release date: 1 Sep 2014 + upgrade urgency: HIGH for Lua scripting users, otherwise LOW. + +* Tue Jul 15 2014 Remi Collet - 2.8.13-1 +- Redis 2.8.13 - Release date: 14 Jul 2014 + upgrade urgency: LOW for Redis and Sentinel + +* Tue Jun 24 2014 Remi Collet - 2.8.12-1 +- Redis 2.8.12 - Release date: 23 Jun 2014 + upgrade urgency: HIGH for Redis, CRITICAL for Sentinel. +- always use jemalloc (instead of tcmalloc) + +* Mon Jun 16 2014 Remi Collet - 2.8.11-1 +- Redis 2.8.11 - Release date: 11 Jun 2014 + upgrade urgency: HIGH if you use Lua scripting, LOW otherwise. + +* Fri Jun 6 2014 Remi Collet - 2.8.10-1 +- Redis 2.8.10 - Release date: 5 Jun 2014 + upgrade urgency: HIGH if you use min-slaves-to-write option. + +* Tue Apr 22 2014 Remi Collet - 2.8.9-1 +- Redis 2.8.9 - Release date: 22 Apr 2014 + upgrade urgency: LOW, only new features introduced, no bugs fixed. + +* Thu Mar 27 2014 Remi Collet - 2.8.8-1 +- Redis 2.8.8 - Release date: 25 Mar 2014 + upgrade urgency: HIGH for Redis, LOW for Sentinel. + +* Sat Mar 8 2014 Remi Collet - 2.8.7-1 +- Redis 2.8.7 - Release date: 5 Mar 2014 + upgrade urgency: LOW for Redis, LOW for Sentinel. + +* Fri Feb 14 2014 Remi Collet - 2.8.6-1 +- Redis 2.8.6 - Release date: 13 Feb 2014 + upgrade urgency: HIGH for Redis, LOW for Sentinel. + +* Thu Jan 16 2014 Remi Collet - 2.8.4-1 +- Redis 2.8.4 - Release date: 13 Jan 2014 + upgrade urgency: MODERATE for Redis and Sentinel. + +* Mon Jan 6 2014 Remi Collet - 2.8.3-2 +- add redis-sentinel command (link to redis-server) +- don't rely on config for daemonize and pidfile +- add redis-sentinel service + +* Sat Dec 14 2013 Remi Collet - 2.8.3-1 +- Redis 2.8.3 + upgrade urgency: MODERATE for Redis, HIGH for Sentinel. +- redis own /etc/redis.conf (needed CONFIG WRITE) +- add sentinel.conf as documentation + +* Mon Dec 2 2013 Remi Collet - 2.8.2-1 +- Redis 2.8.2, new major version +- pull rawhide changes (add tmpfiles) + +* Sun Sep 8 2013 Remi Collet - 2.6.16-1 +- Redis 2.6.16 + upgrade urgency: MODERATE + +* Fri Sep 06 2013 Fabian Deutsch - 2.6.16-1 +- Update to 2.6.16 +- Fix rhbz#973151 +- Fix rhbz#656683 +- Fix rhbz#977357 (Jan Vcelak ) + +* Sat Aug 24 2013 Remi Collet - 2.6.15-1 +- Redis 2.6.15 + upgrade urgency: MODERATE, upgrade ASAP only if you experience + issues related to the expired keys collection algorithm, + or if you use the ZUNIONSTORE command. + +* Sun Jul 28 2013 Remi Collet - 2.6.14-1 +- Redis 2.6.14 + upgrade urgency: HIGH because of the following two issues: + Lua scripting + Replication + AOF in slaves problem + AOF + expires possible race condition +- add option to run tests during build (not in mock) + +* Tue Jul 23 2013 Peter Robinson 2.6.13-4 +- ARM has gperftools + +* Wed Jun 19 2013 Fabian Deutsch - 2.6.13-3 +- Modify jemalloc patch for s390 compatibility (Thanks sharkcz) + +* Fri Jun 07 2013 Fabian Deutsch - 2.6.13-2 +- Unbundle jemalloc + +* Fri Jun 07 2013 Fabian Deutsch - 2.6.13-1 +- Add compile PIE flag (rhbz#955459) +- Update to redis 2.6.13 (rhbz#820919) + +* Tue Apr 30 2013 Remi Collet - 2.6.13-1 +- Redis 2.6.13 + upgrade urgency: MODERATE, nothing very critical + +* Sat Mar 30 2013 Remi Collet - 2.6.12-1 +- Redis 2.6.12 + upgrade urgency: MODERATE, nothing very critical + but a few non trivial bugs + +* Tue Mar 12 2013 Remi Collet - 2.6.11-1 +- Redis 2.6.11 + upgrade urgency: LOW, however updating is encouraged + if you have many instances per server and you want + to lower the CPU / energy usage. + +* Mon Feb 11 2013 Remi Collet - 2.6.10-1 +- Redis 2.6.10 + upgrade urgency: MODERATE, this release contains many non + critical fixes and many small improvements. + +* Thu Jan 17 2013 Remi Collet - 2.6.9-1 +- Redis 2.6.9 + upgrade urgency: MODERATE if you use replication. + +* Fri Jan 11 2013 Remi Collet - 2.6.8-1 +- Redis 2.6.8 + upgrade urgency: MODERATE if you use Lua scripting. Otherwise LOW. + +* Tue Dec 4 2012 Remi Collet - 2.6.7-1 +- Redis 2.6.7 + upgrade urgency: MODERATE (unless you BLPOP using the same + key multiple times). + +* Fri Nov 23 2012 Remi Collet - 2.6.5-1 +- Redis 2.6.5 (upgrade urgency: moderate) + +* Fri Nov 16 2012 Remi Collet - 2.6.4-1 +- Redis 2.6.4 (upgrade urgency: low) + +* Sun Oct 28 2012 Remi Collet - 2.6.2-1 +- Redis 2.6.2 (upgrade urgency: low) +- fix typo in systemd macro + +* Wed Oct 24 2012 Remi Collet - 2.6.0-1 +- Redis 2.6.0 is the latest stable version +- add patch for old glibc on RHEL-5 + +* Sat Oct 20 2012 Remi Collet - 2.6.0-0.2.rc8 +- Update to redis 2.6.0-rc8 +- improve systemd integration + +* Thu Aug 30 2012 Remi Collet - 2.6.0-0.1.rc6 +- Update to redis 2.6.0-rc6 + +* Thu Aug 30 2012 Remi Collet - 2.4.16-1 +- Update to redis 2.4.16 + +* Sat Jul 21 2012 Fedora Release Engineering - 2.4.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jul 08 2012 Silas Sewell - 2.4.15-2 +- Remove TODO from docs + +* Sun Jul 08 2012 Silas Sewell - 2.4.15-1 +- Update to redis 2.4.15 + +* Sat May 19 2012 Silas Sewell - 2.4.13-1 +- Update to redis 2.4.13 + +* Sat Mar 31 2012 Silas Sewell - 2.4.10-1 +- Update to redis 2.4.10 + +* Fri Feb 24 2012 Silas Sewell - 2.4.8-1 +- Update to redis 2.4.8 + +* Sat Feb 04 2012 Silas Sewell - 2.4.7-1 +- Update to redis 2.4.7 + +* Wed Feb 01 2012 Fabian Deutsch - 2.4.6-4 +- Fixed a typo in the spec + +* Tue Jan 31 2012 Fabian Deutsch - 2.4.6-3 +- Fix .service file, to match config (Type=simple). + +* Tue Jan 31 2012 Fabian Deutsch - 2.4.6-2 +- Fix .service file, credits go to Timon. + +* Thu Jan 12 2012 Fabian Deutsch - 2.4.6-1 +- Update to 2.4.6 +- systemd unit file added +- Compiler flags changed to compile 2.4.6 +- Remove doc/ and Changelog + +* Sun Jul 24 2011 Silas Sewell - 2.2.12-1 +- Update to redis 2.2.12 + +* Fri May 06 2011 Dan Horák - 2.2.5-2 +- google-perftools exists only on selected architectures + +* Sat Apr 23 2011 Silas Sewell - 2.2.5-1 +- Update to redis 2.2.5 + +* Sat Mar 26 2011 Silas Sewell - 2.2.2-1 +- Update to redis 2.2.2 + +* Wed Feb 09 2011 Fedora Release Engineering - 2.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Dec 19 2010 Silas Sewell - 2.0.4-1 +- Update to redis 2.0.4 + +* Tue Oct 19 2010 Silas Sewell - 2.0.3-1 +- Update to redis 2.0.3 + +* Fri Oct 08 2010 Silas Sewell - 2.0.2-1 +- Update to redis 2.0.2 +- Disable checks section for el5 + +* Sat Sep 11 2010 Silas Sewell - 2.0.1-1 +- Update to redis 2.0.1 + +* Sat Sep 04 2010 Silas Sewell - 2.0.0-1 +- Update to redis 2.0.0 + +* Thu Sep 02 2010 Silas Sewell - 1.2.6-3 +- Add Fedora build flags +- Send all scriplet output to /dev/null +- Remove debugging flags +- Add redis.conf check to init script + +* Mon Aug 16 2010 Silas Sewell - 1.2.6-2 +- Don't compress man pages +- Use patch to fix redis.conf + +* Tue Jul 06 2010 Silas Sewell - 1.2.6-1 +- Initial package