summary refs log tree commit diff
path: root/nixos/modules/services/databases
diff options
context:
space:
mode:
authorJamie McClymont <jamie@kwiius.com>2020-05-17 20:11:41 +1200
committerJamie McClymont <jamie@kwiius.com>2020-05-17 20:23:48 +1200
commit8cdc8687bffd411f6f5b5e458071f18b4c9dd109 (patch)
tree2e2148017f9060c26fddaed187b700ea102a0a15 /nixos/modules/services/databases
parent6c195563e1fdaa005f448caeb976cb249f838a7d (diff)
downloadnixpkgs-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar
nixpkgs-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.gz
nixpkgs-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.bz2
nixpkgs-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.lz
nixpkgs-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.xz
nixpkgs-8cdc8687bffd411f6f5b5e458071f18b4c9dd109.tar.zst
nixpkgs-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/services/databases')
-rw-r--r--nixos/modules/services/databases/redis.nix3
1 files changed, 1 insertions, 2 deletions
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