dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Remove special handling of systemd-journal-gatewayd

Browse Source
This commit is contained in:
Eelco Dolstra 2014-04-17 19:05:29 +02:00
parent 179acfb664
commit 2ad6933a22
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/system/boot/systemd.nix
View File

@ -79,6 +79,8 @@ let
"systemd-journald.socket" "systemd-journald.socket"
"systemd-journald.service" "systemd-journald.service"
"systemd-journal-flush.service" "systemd-journal-flush.service"
"systemd-journal-gatewayd.socket"
"systemd-journal-gatewayd.service"
"syslog.socket" "syslog.socket"
# SysV init compatibility. # SysV init compatibility.
@ -161,11 +163,6 @@ let
++ optionals cfg.enableEmergencyMode [ ++ optionals cfg.enableEmergencyMode [
"emergency.target" "emergency.target"
"emergency.service" "emergency.service"
]
++ optionals config.services.journald.enableHttpGateway [
"systemd-journal-gatewayd.socket"
"systemd-journal-gatewayd.service"
]; ];
upstreamWants = upstreamWants =
@ -438,10 +435,6 @@ let
ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \ ln -s ../local-fs.target ../remote-fs.target ../network.target ../nss-lookup.target \
../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/ ../nss-user-lookup.target ../swap.target $out/multi-user.target.wants/
${ optionalString config.services.journald.enableHttpGateway ''
ln -s ../systemd-journal-gatewayd.service $out/multi-user-target.wants/
''}
''; # */ ''; # */
in in
@ -632,7 +625,7 @@ in
default = false; default = false;
type = types.bool; type = types.bool;
description = '' description = ''
Enable journal http gateway Whether to enable the HTTP gateway to the journal.
''; '';
}; };
@ -779,6 +772,9 @@ in
}) })
(filterAttrs (name: service: service.startAt != "") cfg.services); (filterAttrs (name: service: service.startAt != "") cfg.services);
systemd.sockets.systemd-journal-gatewayd.wantedBy =
optional config.services.journald.enableHttpGateway "sockets.target";
# Provide the systemd-user PAM service, required to run systemd # Provide the systemd-user PAM service, required to run systemd
# user instances. # user instances.
security.pam.services.systemd-user = security.pam.services.systemd-user =