[pkgsrc/trunk]: pkgsrc/databases/redis redis: fix rc.d script to pass default...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53617908f38c
branches:  trunk
changeset: 437320:53617908f38c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 20 23:37:30 2020 +0000

description:
redis: fix rc.d script to pass default config file.

redis does not look in a particular path but wants the config file
path passed on the command line. The SMF script already did this,
but the rc.d script passed configuration on the command line,
causing redis to neither write a log file nor a database by default.

Bump PKGREVISION.

diffstat:

 databases/redis/Makefile       |  6 +++---
 databases/redis/files/redis.sh |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r a2db06f698a5 -r 53617908f38c databases/redis/Makefile
--- a/databases/redis/Makefile  Thu Aug 20 22:27:13 2020 +0000
+++ b/databases/redis/Makefile  Thu Aug 20 23:37:30 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2020/08/19 16:32:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2020/08/20 23:37:30 wiz Exp $
 
 DISTNAME=      redis-6.0.6
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    databases
 MASTER_SITES=  http://download.redis.io/releases/
 
@@ -30,7 +30,7 @@
 CONF_FILES_MODE=       0640
 
 BUILD_DEFS+=           VARBASE REDIS_USER REDIS_GROUP REDIS_DATADIR
-BUILD_DEFS+=           REDIS_LOGDIR REDIS_PIDDIR
+BUILD_DEFS+=           REDIS_LOGDIR REDIS_PIDDIR PKG_SYSCONFDIR
 
 REDIS_USER?=           redis
 REDIS_GROUP?=          redis
diff -r a2db06f698a5 -r 53617908f38c databases/redis/files/redis.sh
--- a/databases/redis/files/redis.sh    Thu Aug 20 22:27:13 2020 +0000
+++ b/databases/redis/files/redis.sh    Thu Aug 20 23:37:30 2020 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: redis.sh,v 1.3 2020/08/10 11:23:50 wiz Exp $
+# $NetBSD: redis.sh,v 1.4 2020/08/20 23:37:30 wiz Exp $
 #
 # PROVIDE: redis
 # REQUIRE: DAEMON network
@@ -14,7 +14,7 @@
 rcvar=$name
 command="@PREFIX@/bin/redis-server"
 redis_user="@REDIS_USER@"
-redis_flags="${redis_flags:- --bind 127.0.0.1 --daemonize yes}"
+redis_flags="@PKG_SYSCONFDIR@/redis.conf"
 
 if [ -f /etc/rc.subr ]; then
         load_rc_config $name