From 8cdc8687bffd411f6f5b5e458071f18b4c9dd109 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 17 May 2020 20:11:41 +1200 Subject: redis: handle changes to systemd support The 6.0 changelog notes that systemd support was rewritten. The effects of that seem to be twofold: * Redis will silently fail to sd_notify if not built with libsystemd, breaking our unit configuration. * It also appears to misbehave if told to daemonize when running under systemd -- note that upstream's sample unit configuration does not daemonize: https://github.com/antirez/redis/blob/unstable/utils/systemd-redis_server.service --- nixos/modules/services/databases/redis.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos/modules/services/databases') diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 5c817422aae..799c3db6216 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -11,12 +11,11 @@ let port ${toString cfg.port} ${condOption "bind" cfg.bind} ${condOption "unixsocket" cfg.unixSocket} - daemonize yes + daemonize no supervised systemd loglevel ${cfg.logLevel} logfile ${cfg.logfile} syslog-enabled ${redisBool cfg.syslog} - pidfile /run/redis/redis.pid databases ${toString cfg.databases} ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save} dbfilename dump.rdb -- cgit 1.4.1