CVS commit: pkgsrc/databases/redis

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Aug 20 23:37:30 UTC 2020

Modified Files:
        pkgsrc/databases/redis: Makefile
        pkgsrc/databases/redis/files: redis.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/databases/redis/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/redis/files/redis.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/redis/Makefile
diff -u pkgsrc/databases/redis/Makefile:1.58 pkgsrc/databases/redis/Makefile:1.59
--- pkgsrc/databases/redis/Makefile:1.58        Wed Aug 19 16:32:40 2020
+++ pkgsrc/databases/redis/Makefile     Thu Aug 20 23:37:30 2020
@@ -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=           ${EGDIR}/redis.conf.example
 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

Index: pkgsrc/databases/redis/files/redis.sh
diff -u pkgsrc/databases/redis/files/redis.sh:1.3 pkgsrc/databases/redis/files/redis.sh:1.4
--- pkgsrc/databases/redis/files/redis.sh:1.3   Mon Aug 10 11:23:50 2020
+++ pkgsrc/databases/redis/files/redis.sh       Thu Aug 20 23:37:30 2020
@@ -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 @@ name="redis"
 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