summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-18 17:32:24 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-18 17:32:24 +0200
commitfec3bc85a686bce8b1c9405b88ff3fbc7dd69344 (patch)
tree041b59d4168608afd50ce1ad9ed5d0484272df51 /nixos/modules
parent16bba2db2ef9fd42a5f1f3517bdd33c217fe3c26 (diff)
downloadnixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.tar
nixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.tar.gz
nixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.tar.bz2
nixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.tar.lz
nixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.tar.xz
nixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.tar.zst
nixlib-fec3bc85a686bce8b1c9405b88ff3fbc7dd69344.zip
postgresql: Use systemd's new "mixed" kill mode
"Mixed" mode sends the initial SIGINT only to the main process, but
sends the SIGKILL after the time-out expires to the entire cgroup.
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/databases/postgresql.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 2960ad913629..ad83cb553e1d 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -215,7 +215,7 @@ in
             # Shut down Postgres using SIGINT ("Fast Shutdown mode").  See
             # http://www.postgresql.org/docs/current/static/server-shutdown.html
             KillSignal = "SIGINT";
-            KillMode = "process"; # FIXME: this may cause processes to be left behind in the cgroup even after the final SIGKILL
+            KillMode = "mixed";
 
             # Give Postgres a decent amount of time to clean up after
             # receiving systemd's SIGINT.