redis: adjust user and group permissions

6 files changed, 20 insertions, 16 deletions

diff --git a/redis/.footprint b/redis/.footprint
index 5493b485c..f9ade3a33 100644
--- a/redis/.footprint
+++ b/redis/.footprint
@@ -1,7 +1,7 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/redis
--rw-r--r--	root/root	etc/redis.conf
+-rw-r--r--	redis/root	etc/redis.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/redis-benchmark
@@ -12,4 +12,6 @@ lrwxrwxrwx	root/root	usr/bin/redis-sentinel -> redis-server
 -rwxr-xr-x	root/root	usr/bin/redis-server
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/lib/
-drwxr-xr-x	root/root	var/lib/redis/
+drwxr-xr-x	redis/root	var/lib/redis/
+drwxr-xr-x	root/root	var/log/
+-rw-r-----	redis/redis	var/log/redis.log (EMPTY)
diff --git a/redis/.md5sum b/redis/.md5sum
index b8821906a..301e8061f 100644
--- a/redis/.md5sum
+++ b/redis/.md5sum
@@ -1,3 +1,3 @@
 f220ea7468eb87986435d69e9ce080c6  redis-4.0.0.tar.gz
-6b7e6b1fe58ec65b1deb15654fb878d3  redis.conf
+004bd25639664a5e732a7ec8698fc1f4  redis.conf
 28cb4b04d228f88687f3ea85ab0a3c04  redis.rc
diff --git a/redis/.signature b/redis/.signature
index 89a2bb899..8a32b096c 100644
--- a/redis/.signature
+++ b/redis/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34o+h5vQMJ6dlQDJjS7MwkJl/n96SiWIBzRpx3/1o4DV2QVVMkkBJgyIWEKzx8HMJREJwZVrF/EG2k6tF/62yA0=
-SHA256 (Pkgfile) = c341baae4d2fce9407a2dcb42bfdb2ca3d0a92af58c2f0daf88e4b59998f78d3
-SHA256 (.footprint) = 4387ee19c2f532aa7fe636611e08ecbabbfbfc7f4208ae848786c61493bc81e9
+RWSagIOpLGJF3/2yAT8nYU7LkSrx8hFHITDRnNl+Njn0wQ/1S9z4c62WpqUVqFlk4RfN7AXDI5VAsGS+uKfIFicbjCFWXrbGoAc=
+SHA256 (Pkgfile) = b8735557bbf00d491dcc4d4e677645638331f13b39788eb1a3f9443cfe0cf9de
+SHA256 (.footprint) = c21eb747e36a5bc027c6f1560b36c4528d5673135a7d228b13009d9a99de969f
 SHA256 (redis-4.0.0.tar.gz) = d539ae309295721d5c3ed7298939645b6f86ab5d25fdf2a0352ab575c159df2d
-SHA256 (redis.conf) = a6562d620f24f680089a27632ae49f4c69ccb3e0232bd65c7da1ec0ecd8f30f9
+SHA256 (redis.conf) = c392fe6bb36ba7970561d97e2214e4a916193c32e12a82d1b8cb2dc12dac377f
 SHA256 (redis.rc) = 364257ea85d9e71196bdc1621da26b07684366c7030fbdea60b72a603e854a4f
diff --git a/redis/Pkgfile b/redis/Pkgfile
index 56b702f9d..7a43071da 100644
--- a/redis/Pkgfile
+++ b/redis/Pkgfile
@@ -6,18 +6,19 @@
 name=redis
 version=4.0.0
 release=1
-source=(
-    http://download.redis.io/releases/$name-$version.tar.gz
-    redis.conf
-    redis.rc
-)
+source=(http://download.redis.io/releases/$name-$version.tar.gz redis.conf \
+redis.rc)
 
 build() {
     cd $name-$version/src
 
     make
     make PREFIX=$PKG/usr/ install
+
     install -D -m 755 $SRC/redis.rc $PKG/etc/rc.d/redis
-    install -D -m 644 $SRC/redis.conf $PKG/etc/redis.conf
-    install -d -m 755 $PKG/var/lib/redis
+    install -D -m 644 -o redis $SRC/redis.conf $PKG/etc/redis.conf
+    install -d -m 755 -o redis $PKG/var/lib/redis
+
+    install -d -m 755 $PKG/var/log
+    install -m 640 -o redis -g redis /dev/null $PKG/var/log/redis.log
 }
diff --git a/redis/pre-install b/redis/pre-install
index a5ef3cb12..aa13d0ca1 100755
--- a/redis/pre-install
+++ b/redis/pre-install
@@ -1,4 +1,5 @@
 #!/bin/bash
 
-getent passwd redis || useradd -m  -d /var/lib/redis -s /bin/false redis
+getent group redis >/dev/null || groupadd -r redis
+getent passwd redis || useradd -m -g redis -d /var/lib/redis -s /bin/false redis
 passwd -l redis
diff --git a/redis/redis.conf b/redis/redis.conf
index aae4f1c98..ebfc4a1e8 100644
--- a/redis/redis.conf
+++ b/redis/redis.conf
@@ -160,7 +160,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+logfile "/var/log/redis.log"
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.