diff options
| author | wiz <wiz@pkgsrc.org> | 2020-08-20 23:37:30 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-08-20 23:37:30 +0000 |
| commit | ca981dd85496206f292cf546d63e6a34c6a99ece (patch) | |
| tree | 806bdced113eee54642f0e189d0b4599e08bd587 /databases/redis | |
| parent | 80310bb2fa2246aa7ee0f8c151b31e83e3ae2e5c (diff) | |
| download | pkgsrc-ca981dd85496206f292cf546d63e6a34c6a99ece.tar.gz | |
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 (limited to 'databases/redis')
| -rw-r--r-- | databases/redis/Makefile | 6 | ||||
| -rw-r--r-- | databases/redis/files/redis.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 99196952df3..afe1a682ac2 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -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 ${PKG_SYSCONFDIR}/redis.conf 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 --git a/databases/redis/files/redis.sh b/databases/redis/files/redis.sh index 33ac32db3d4..49c79830c2d 100644 --- a/databases/redis/files/redis.sh +++ b/databases/redis/files/redis.sh @@ -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 |