diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 38 | ||||
| -rw-r--r-- | redis.d | 78 | ||||
| -rw-r--r-- | redis.install | 12 | ||||
| -rw-r--r-- | redis.service | 3 | ||||
| -rw-r--r-- | redis.tmpfiles.d | 1 |
6 files changed, 48 insertions, 103 deletions
@@ -1,10 +1,11 @@ # Generated by mksrcinfo v8 -# Wed Jan 20 13:02:32 UTC 2016 +# Wed Jan 20 13:03:28 UTC 2016 pkgbase = binx32-redis pkgdesc = Advanced key-value store (x32 ABI) - pkgver = 2.6.2 - pkgrel = 1.1 + pkgver = 2.8.9 + pkgrel = 1 url = http://redis.io/ + install = redis.install arch = x86_64 license = BSD makedepends = gcc-multilib-x32>=3.1 @@ -12,17 +13,17 @@ pkgbase = binx32-redis makedepends = pkgconfig depends = bash depends = libx32-glibc - depends = redis=2.6.2 + depends = redis=2.8.9 backup = etc/redis-x32.conf backup = etc/logrotate.d/redis-x32 - source = http://redis.googlecode.com/files/redis-2.6.2.tar.gz - source = redis.d + source = http://download.redis.io/releases/redis-2.8.9.tar.gz source = redis.service source = redis.logrotate - md5sums = 4f788dfb3ee86c7e864dfe537870bb5a - md5sums = 2219168289fc918cb29718399a50a036 - md5sums = a9ebb2cdc0c1166ec9684bf3a891e41e + source = redis.tmpfiles.d + md5sums = 3c106b0f1128dc930684e2da88b2a03d + md5sums = db421c66570172e780ab6c4c9e41ccca md5sums = 5a51ae6c10564edb716a93f22e821d67 + md5sums = 33b11afbb94d642606fc12ba4dda9985 pkgname = binx32-redis @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79038 2012-10-29 14:31:32Z spupykin $ +# $Id: PKGBUILD 109954 2014-04-22 14:53:31Z spupykin $ # Upstream Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Upstream Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> @@ -6,8 +6,8 @@ _basepkgname=redis pkgname=binx32-redis -pkgver=2.6.2 -pkgrel=1.1 +pkgver=2.8.9 +pkgrel=1 pkgdesc="Advanced key-value store (x32 ABI)" arch=('x86_64') url="http://redis.io/" @@ -16,14 +16,25 @@ depends=('bash' 'libx32-glibc' "${_basepkgname}=${pkgver}") makedepends=('gcc-multilib-x32>=3.1' 'make' 'pkgconfig') backup=("etc/redis-x32.conf" "etc/logrotate.d/redis-x32") -source=("http://redis.googlecode.com/files/${_basepkgname}-${pkgver}.tar.gz" - "redis.d" +install=redis.install +source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" - "redis.logrotate") -md5sums=('4f788dfb3ee86c7e864dfe537870bb5a' - '2219168289fc918cb29718399a50a036' - 'a9ebb2cdc0c1166ec9684bf3a891e41e' - '5a51ae6c10564edb716a93f22e821d67') + "redis.logrotate" + "redis.tmpfiles.d") +md5sums=('3c106b0f1128dc930684e2da88b2a03d' + 'db421c66570172e780ab6c4c9e41ccca' + '5a51ae6c10564edb716a93f22e821d67' + '33b11afbb94d642606fc12ba4dda9985') + +prepare() { + cd "$srcdir/${_basepkgname}-${pkgver}" + sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf + sed -i 's|daemonize no|daemonize yes|' redis.conf + sed -i 's|dir \./|dir /var/lib/redis-x32/|' redis.conf + sed -i 's|pidfile .*|pidfile /run/redis-x32/redis-x32.pid|' redis.conf + sed -i 's|logfile stdout|logfile /var/log/redis-x32.log|' redis.conf + sed -i 's|port 6379|port 6378|' redis.conf +} build() { cd "$srcdir/${_basepkgname}-${pkgver}" @@ -37,13 +48,10 @@ package() { for _x in ${pkgdir}/usr/bin/*; do mv $_x $_x-x32; done - install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis-x32" install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis-x32.service install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis-x32" - sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis-x32/|;s|logfile stdout|logfile /var/log/redis-x32.log| ' $srcdir/${_basepkgname}-${pkgver}/redis.conf - sed -i 's|pidfile /var/run/redis.pid|pidfile /var/run/redis-x32.pid|;s|port 6379|port 6378| ' $srcdir/${_basepkgname}-${pkgver}/redis.conf - - install -D -m644 "$srcdir/${_basepkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis-x32.conf" + install -Dm644 "$srcdir/${_basepkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis-x32.conf" + install -Dm644 "$srcdir/redis.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/redis-x32.conf" # install license install -dm755 "$pkgdir"/usr/share/licenses diff --git a/redis.d b/redis.d deleted file mode 100644 index b8e05c7dd4fa..000000000000 --- a/redis.d +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -daemon_name=redis-x32 - -. /etc/rc.conf -. /etc/rc.d/functions - -REDISPORT=6379 -EXEC=/usr/bin/redis-server-x32 -CLIEXEC=/usr/bin/redis-cli-x32 -PIDFILE=/var/run/redis-x32.pid -WORKDIR=/var/lib/redis-x32 -CONF="/etc/redis-x32.conf" - -# 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" - [ -d $WORKDIR ] || mkdir $WORKDIR - - if [ -f $PIDFILE ]; then - stat_fail - exit 1 - else - $EXEC $CONF >/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - fi - ;; - - stop) - stat_busy "Stopping $daemon_name" - - if [ ! -f $PIDFILE ]; then - stat_fail - exit 1 - else - PID=$(cat $PIDFILE) - - # And grab the server address - REDISADDR=`egrep -o '^bind ([^#]+)' $CONF | cut -d' ' -f2` - [ -n "$REDISADDR" ] && CLIEXEC="$CLIEXEC -h $REDISADDR" - - $CLIEXEC -p $REDISPORT shutdown - [ -d /proc/${PID} ] && sleep 1 - [ -d /proc/${PID} ] && sleep 5 - [ -d /proc/${PID} ] && kill -9 $PID - [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; } - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/redis.install b/redis.install new file mode 100644 index 000000000000..466646b4da93 --- /dev/null +++ b/redis.install @@ -0,0 +1,12 @@ +post_install() { + touch var/log/redis-x32.log + chown redis:redis var/log/redis-x32.log + systemd-tmpfiles --create redis-x32.conf + install -dm0700 var/lib/redis-x32 + chown -R redis:redis var/lib/redis-x32 +} + +post_upgrade() { + post_install + echo "Redis starts from redis user by default. Check redis-x32.service file" +} diff --git a/redis.service b/redis.service index a784afcc1969..28656f1677fa 100644 --- a/redis.service +++ b/redis.service @@ -4,7 +4,8 @@ After=network.target [Service] Type=forking -PIDFile=/run/redis-x32.pid +User=redis +PIDFile=/run/redis-x32/redis-x32.pid ExecStartPre=/bin/mkdir -p /var/lib/redis-x32 ExecStart=/usr/bin/redis-server-x32 /etc/redis-x32.conf ExecStop=/usr/bin/redis-cli-x32 shutdown diff --git a/redis.tmpfiles.d b/redis.tmpfiles.d new file mode 100644 index 000000000000..07f20580b141 --- /dev/null +++ b/redis.tmpfiles.d @@ -0,0 +1 @@ +d /run/redis-x32 0755 redis redis - |