summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2013-05-06 08:45:00 +0000
committerDirkjan Ochtman <djc@gentoo.org>2013-05-06 08:45:00 +0000
commit9301c43c9d8fb19af8ccef53f370150da5469b17 (patch)
treec6e26d1682427aeddbffae465f26086be1fc6083 /dev-db
parentVersion bump. (diff)
downloadgentoo-2-9301c43c9d8fb19af8ccef53f370150da5469b17.tar.gz
gentoo-2-9301c43c9d8fb19af8ccef53f370150da5469b17.tar.bz2
gentoo-2-9301c43c9d8fb19af8ccef53f370150da5469b17.zip
Update init script for redis-2.6.13 (thanks to jbergstroem).
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/redis/ChangeLog6
-rw-r--r--dev-db/redis/files/redis.initd-223
-rw-r--r--dev-db/redis/redis-2.6.13.ebuild4
3 files changed, 30 insertions, 3 deletions
diff --git a/dev-db/redis/ChangeLog b/dev-db/redis/ChangeLog
index 1652001caf44..b817c6ce9ff1 100644
--- a/dev-db/redis/ChangeLog
+++ b/dev-db/redis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/redis
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.63 2013/05/03 08:08:29 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/ChangeLog,v 1.64 2013/05/06 08:44:59 djc Exp $
+
+ 06 May 2013; Dirkjan Ochtman <djc@gentoo.org> +files/redis.initd-2,
+ redis-2.6.13.ebuild:
+ Update init script for redis-2.6.13 (thanks to jbergstroem).
03 May 2013; Dirkjan Ochtman <djc@gentoo.org> -redis-2.6.7.ebuild,
-redis-2.6.8.ebuild:
diff --git a/dev-db/redis/files/redis.initd-2 b/dev-db/redis/files/redis.initd-2
new file mode 100644
index 000000000000..3dd3d78154a1
--- /dev/null
+++ b/dev-db/redis/files/redis.initd-2
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/files/redis.initd-2,v 1.1 2013/05/06 08:45:00 djc Exp $
+
+REDIS_DIR=${REDIS_DIR:-/var/lib/redis}
+REDIS_CONF=${REDIS_CONF:-/etc/redis.conf}
+REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"}
+REDIS_USER=${REDIS_USER:-redis}
+REDIS_GROUP=${REDIS_GROUP:-redis}
+
+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:-/var/run/redis/redis.pid}
+
+depend() {
+ use net localmount logger
+ after keepalived
+}
+
+start_pre() {
+ checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID})
+}
diff --git a/dev-db/redis/redis-2.6.13.ebuild b/dev-db/redis/redis-2.6.13.ebuild
index 253e5b8c8f4a..3aae95a3b1f4 100644
--- a/dev-db/redis/redis-2.6.13.ebuild
+++ b/dev-db/redis/redis-2.6.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.6.13.ebuild,v 1.1 2013/05/03 08:07:23 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/redis/redis-2.6.13.ebuild,v 1.2 2013/05/06 08:44:59 djc Exp $
EAPI=5
@@ -88,7 +88,7 @@ src_install() {
fperms 0644 /etc/{redis,sentinel}.conf
newconfd "${FILESDIR}/redis.confd" redis
- newinitd "${FILESDIR}/redis.initd" redis
+ newinitd "${FILESDIR}/redis.initd-2" redis
nonfatal dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README