public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/systemd: add journal http gateway support

Browse Source
This commit is contained in:
Jaka Hudoklin 2014-02-01 14:50:20 +01:00
parent ae9c22df3f
commit 616b4b5b0e
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View File

@ -110,6 +110,7 @@
openldap = 99; openldap = 99;
memcached = 100; memcached = 100;
cgminer = 101; cgminer = 101;
systemd-journal-gateway = 102;
# When adding a uid, make sure it doesn't match an existing gid. # When adding a uid, make sure it doesn't match an existing gid.
@ -199,6 +200,7 @@
haproxy = 92; haproxy = 92;
openldap = 93; openldap = 93;
connman = 94; connman = 94;
systemd-journal-gateway = 95;
# When adding a gid, make sure it doesn't match an existing uid. # When adding a gid, make sure it doesn't match an existing uid.

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

@ -132,6 +132,11 @@ 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 =
@ -372,6 +377,10 @@ 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
@ -567,6 +576,14 @@ in
''; '';
}; };
services.journald.enableHttpGateway = mkOption {
default = false;
type = types.bool;
description = ''
Enable journal http gateway
'';
};
services.logind.extraConfig = mkOption { services.logind.extraConfig = mkOption {
default = ""; default = "";
type = types.lines; type = types.lines;
@ -673,6 +690,8 @@ in
}; };
users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal; users.extraGroups.systemd-journal.gid = config.ids.gids.systemd-journal;
users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
# Generate timer units for all services that have a ‘startAt’ value. # Generate timer units for all services that have a ‘startAt’ value.
systemd.timers = systemd.timers =