[arch-commits] Commit in redis/trunk (4 files)

[Sergej Pupykin]

    Date: Monday, August 5, 2013 @ 12:49:31
  Author: spupykin
Revision: 95068

upgpkg: redis 2.6.14-2

upd

Added:
  redis/trunk/redis.install
  redis/trunk/redis.tmpfiles.d
Modified:
  redis/trunk/PKGBUILD
  redis/trunk/redis.service

------------------+
 PKGBUILD         |   19 ++++++++++++++-----
 redis.install    |   14 ++++++++++++++
 redis.service    |    3 ++-
 redis.tmpfiles.d |    1 +
 4 files changed, 31 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-05 10:49:27 UTC (rev 95067)
+++ PKGBUILD	2013-08-05 10:49:31 UTC (rev 95068)
@@ -5,7 +5,7 @@
 
 pkgname=redis
 pkgver=2.6.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
 url="http://redis.io/"
@@ -14,17 +14,25 @@
 makedepends=('gcc>=3.1' 'make' 'pkgconfig')
 backup=("etc/redis.conf"
 	"etc/logrotate.d/redis")
+install=redis.install
 source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.service"
-	"redis.logrotate")
+	"redis.logrotate"
+	"redis.tmpfiles.d")
 md5sums=('02e0c06e953413017ff64862953e2756'
-         '5ab9fdb200e15c13b450fda77fa030b6'
-         '9e2d75b7a9dc421122d673fe520ef17f')
+         '5320aa6d0f31aadc1d6202ca40425aea'
+         '9e2d75b7a9dc421122d673fe520ef17f'
+         'dd9ab8022b4d963b2e5899170dfff490')
 
+prepare() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf
+  sed -i 's|pidfile .*|pidfile /run/redis/redis.pid|' redis.conf
+}
+
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
   make MALLOC=libc
-  sed -i 's|# bind 127.0.0.1|bind 127.0.0.1|' redis.conf
 }
 
 package() {
@@ -37,4 +45,5 @@
   install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis"
   sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf
   install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf"
+  install -Dm644 "$srcdir/redis.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/redis.conf"
 }

Added: redis.install
===================================================================
--- redis.install	                        (rev 0)
+++ redis.install	2013-08-05 10:49:31 UTC (rev 95068)
@@ -0,0 +1,14 @@
+post_install() {
+  grep -E "^redis:" etc/group >/dev/null || groupadd --system redis
+  grep -E "^redis:" etc/passwd >/dev/null || useradd --system -g redis -d /var/lib/redis -s /bin/false redis
+  touch var/log/redis.log
+  chown redis:redis var/log/redis.log
+  systemd-tmpfiles --create redis.conf
+  install -dm0700 var/lib/redis
+  chown -R redis:redis var/lib/redis
+}
+
+post_upgrade() {
+  post_install
+  echo "Redis starts from redis user by default. Check redis.service file"
+}

Modified: redis.service
===================================================================
--- redis.service	2013-08-05 10:49:27 UTC (rev 95067)
+++ redis.service	2013-08-05 10:49:31 UTC (rev 95068)
@@ -4,7 +4,8 @@
 
 [Service]
 Type=forking
-PIDFile=/run/redis.pid
+User=redis
+PIDFile=/run/redis/redis.pid
 ExecStartPre=/bin/mkdir -p /var/lib/redis
 ExecStart=/usr/bin/redis-server /etc/redis.conf
 ExecStop=/usr/bin/redis-cli shutdown

Added: redis.tmpfiles.d
===================================================================
--- redis.tmpfiles.d	                        (rev 0)
+++ redis.tmpfiles.d	2013-08-05 10:49:31 UTC (rev 95068)
@@ -0,0 +1 @@
+d /run/redis 0755 redis redis -