Received: by mail.netbsd.org (Postfix, from userid 605) id B356584D25; Thu, 20 Aug 2020 23:37:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3A33584D22 for ; Thu, 20 Aug 2020 23:37:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id cDia33uIFpMD for ; Thu, 20 Aug 2020 23:37:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B22BA84D21 for ; Thu, 20 Aug 2020 23:37:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AF331FB28; Thu, 20 Aug 2020 23:37:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159796665086100" MIME-Version: 1.0 Date: Thu, 20 Aug 2020 23:37:30 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/databases/redis To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20200820233730.AF331FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159796665086100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_159796665086100 Content-Disposition: inline Content-Length: 1578 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_159796665086100--