diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-30 10:55:42 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-30 10:55:42 +0200 |
| commit | d9a9508e07a00015e2a2f278719a9665ff565961 (patch) | |
| tree | 97ddb1c2607a58c2a632da571b281641dfdf9df2 /community/redis | |
| parent | 0a2ba65e7cf7d8d0452654b2f25cbb84a89fe7cf (diff) | |
| parent | b7cd4b184f75d3d2b54b356e08f296df3a9afb38 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/buoh/PKGBUILD
core/openssl/PKGBUILD
extra/llvm/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pygobject/PKGBUILD
extra/pygobject2/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
testing/consolekit/PKGBUILD
testing/gnome-keyring/PKGBUILD
testing/lirc/PKGBUILD
testing/samba/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/redis')
| -rw-r--r-- | community/redis/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/redis/redis.d | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 28e00f972..4116f6fd6 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69786 2012-04-23 09:37:03Z spupykin $ +# $Id: PKGBUILD 70007 2012-04-28 09:18:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis pkgver=2.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') url="http://redis.io/" @@ -19,7 +19,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") md5sums=('ccd193d80196855343840db6110bf58d' - 'f8fb4b00ee3636c7dc7c173e2f6a4e76' + '9d58bcc2bc0e193353206c608e71f5d6' '9e2d75b7a9dc421122d673fe520ef17f') build() { diff --git a/community/redis/redis.d b/community/redis/redis.d index afd001fd5..4babbaaa5 100644 --- a/community/redis/redis.d +++ b/community/redis/redis.d @@ -12,9 +12,14 @@ PIDFILE=/var/run/redis.pid WORKDIR=/var/lib/redis CONF="/etc/redis.conf" -PID=$(cat $PIDFILE) +# Check if process exists +PID=$(cat $PIDFILE 2>/dev/null) [ -d /proc/${PID} ] || rm -f $PIDFILE +# Grab the server password, if exists +REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\ -f 2` +[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS" + case "$1" in start) stat_busy "Starting $daemon_name" |