summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/redis/doinst.sh2
-rw-r--r--system/redis/rc.redis.new2
-rw-r--r--system/redis/redis.SlackBuild13
-rw-r--r--system/redis/redis.info6
-rw-r--r--system/redis/redis.logrotate2
5 files changed, 14 insertions, 11 deletions
diff --git a/system/redis/doinst.sh b/system/redis/doinst.sh
index 723cedbc2c..27ee4d0acc 100644
--- a/system/redis/doinst.sh
+++ b/system/redis/doinst.sh
@@ -22,6 +22,6 @@ preserve_perms() {
config $NEW
}
-config etc/redis.conf.new
+config etc/redis/redis.conf.new
config etc/logrotate.d/redis.new
preserve_perms etc/rc.d/rc.redis.new
diff --git a/system/redis/rc.redis.new b/system/redis/rc.redis.new
index f20fde7673..b7d715f4ba 100644
--- a/system/redis/rc.redis.new
+++ b/system/redis/rc.redis.new
@@ -6,7 +6,7 @@ PORT=6379
SERV=/usr/bin/redis-server
CLI=/usr/bin/redis-cli
PIDFILE=/var/run/redis.pid
-CONF=/etc/redis.conf
+CONF=/etc/redis/redis.conf
redis_start() {
if [ ! -r $CONF ]; then
diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild
index 38e3185845..40bb97d883 100644
--- a/system/redis/redis.SlackBuild
+++ b/system/redis/redis.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for redis
# Copyright 2010 Kuroi Kenshi <kuroi_kenshi96@yahoo.com>
-# Copyright 2012-2013 Audrius Kažukauskas <audrius@neutrino.lt>
+# Copyright 2012-2014 Audrius Kažukauskas <audrius@neutrino.lt>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=redis
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-2.8.8}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -92,18 +92,21 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# Use sample config and set some sane defaults.
-install -D -m 0644 redis.conf $PKG/etc/redis.conf.new
+install -D -m 0644 redis.conf $PKG/etc/redis/redis.conf.new
sed -i \
-e 's|^daemonize no|daemonize yes|' \
-e 's|^dir \.|dir /var/lib/redis|' \
- -e 's|^logfile ""|logfile /var/log/redis.log|' \
+ -e 's|^logfile ""|logfile /var/log/redis/redis.log|' \
-e 's|^# bind 127.0.0.1|bind 127.0.0.1|' \
- $PKG/etc/redis.conf.new
+ $PKG/etc/redis/redis.conf.new
# Create data directory.
mkdir -p $PKG/var/lib/redis
chmod 0700 $PKG/var/lib/redis
+# Create log directory.
+mkdir -p $PKG/var/log/redis
+
# Install init script.
mkdir -p $PKG/etc/rc.d
cat $CWD/rc.redis.new > $PKG/etc/rc.d/rc.redis.new
diff --git a/system/redis/redis.info b/system/redis/redis.info
index 387b56620c..f14d6cf8f1 100644
--- a/system/redis/redis.info
+++ b/system/redis/redis.info
@@ -1,8 +1,8 @@
PRGNAM="redis"
-VERSION="2.8.3"
+VERSION="2.8.8"
HOMEPAGE="http://redis.io/"
-DOWNLOAD="http://download.redis.io/releases/redis-2.8.3.tar.gz"
-MD5SUM="6327e6786130b556b048beef0edbdfa7"
+DOWNLOAD="http://download.redis.io/releases/redis-2.8.8.tar.gz"
+MD5SUM="f3af82ca88b9d84c81d0b77614d07426"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/redis/redis.logrotate b/system/redis/redis.logrotate
index 2f3e6d6c1a..12e6ea89f1 100644
--- a/system/redis/redis.logrotate
+++ b/system/redis/redis.logrotate
@@ -1,4 +1,4 @@
-/var/log/redis.log {
+/var/log/redis/redis.log {
daily
rotate 7
copytruncate