diff options
author | Jamie McClymont <jamie@kwiius.com> | 2020-05-17 20:11:41 +1200 |
---|---|---|
committer | Jamie McClymont <jamie@kwiius.com> | 2020-05-17 20:23:48 +1200 |
commit | 8cdc8687bffd411f6f5b5e458071f18b4c9dd109 (patch) | |
tree | 2e2148017f9060c26fddaed187b700ea102a0a15 /nixos/modules | |
parent | 6c195563e1fdaa005f448caeb976cb249f838a7d (diff) | |
download | nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.gz nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.bz2 nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.lz nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.xz nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.zst nixlib-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.zip |
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
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/databases/redis.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 5c817422aae5..799c3db62166 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 |