From 1665c5290cd2cd19055e672154abfc78eef16877 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Wed, 24 Mar 2021 14:43:52 +0100 Subject: [PATCH] nixos/systemd: add namespaced (templated) journald sockets and service --- nixos/modules/system/boot/systemd.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 45febb27bfd7..79f83d3d8f43 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -70,7 +70,10 @@ let # Journal. "systemd-journald.socket" + "systemd-journald@.socket" + "systemd-journald-varlink@.socket" "systemd-journald.service" + "systemd-journald@.service" "systemd-journal-flush.service" "systemd-journal-catalog-update.service" ] ++ (optional (!config.boot.isContainer) "systemd-journald-audit.socket") ++ [ @@ -1178,6 +1181,8 @@ in systemd.services."user-runtime-dir@".restartIfChanged = false; systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; systemd.services.systemd-journald.stopIfChanged = false; + systemd.services."systemd-journald@".restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; + systemd.services."systemd-journald@".stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ];