diff options
| author | Timothy DeHerrera <tim.deh@pm.me> | 2021-08-20 08:32:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 08:32:05 -0600 |
| commit | 066bcd954fc2a81c4fe97025b9a86e53d6835432 (patch) | |
| tree | 3aee2f0b185ab10fa833746eb3c46d1d1a18df3f /nixos/modules/system/boot/systemd.nix | |
| parent | 47790d05f4e9d9985ff843f18b85ba9a948c4dd4 (diff) | |
| parent | 1665c5290cd2cd19055e672154abfc78eef16877 (diff) | |
| download | nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.tar nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.tar.gz nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.tar.bz2 nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.tar.lz nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.tar.xz nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.tar.zst nixpkgs-066bcd954fc2a81c4fe97025b9a86e53d6835432.zip | |
Merge pull request #117476 from jbgi/systemd-journald@
nixos/systemd: add namespaced (templated) journald sockets and service
Diffstat (limited to 'nixos/modules/system/boot/systemd.nix')
| -rw-r--r-- | nixos/modules/system/boot/systemd.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index b53cb9e7d41..934c57f8391 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") ++ [ @@ -1181,6 +1184,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" ]; |