git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74084 from WilliButz/systemd-services/use-correct-groups

dont use nogroup for networkd, resolved and timesyncd

commite6aba99c544bee162074b43c8a676bec595cbe09 authorFlorian Klink <flokli@flokli.de> dateMon 25 Nov 2019, 20:05 (7 years ago) parent01ea563ec16f4f
4 files changed+15−5
nixos/modules/system/boot/networkd.nix+2 nixos/modules/system/boot/resolved.nix+2 nixos/modules/system/boot/timesyncd.nix+4−1 nixos/tests/systemd-networkd-wireguard.nix+7−4
nixos/modules/system/boot/networkd.nix+2
@@ -924,6 +924,8 @@ in
924924
925925 config = mkIf config.systemd.network.enable {
926926
927+ users.users.systemd-network.group = "systemd-network";
928+
927929 systemd.additionalUpstreamSystemUnits = [
928930 "systemd-networkd.service" "systemd-networkd-wait-online.service"
929931 ];
nixos/modules/system/boot/resolved.nix+2
@@ -136,6 +136,8 @@ in
136136 }
137137 ];
138138
139+ users.users.resolved.group = "systemd-resolve";
140+
139141 systemd.additionalUpstreamSystemUnits = [
140142 "systemd-resolved.service"
141143 ];
nixos/modules/system/boot/timesyncd.nix+4−1
@@ -50,7 +50,10 @@ with lib;
5050 ${config.services.timesyncd.extraConfig}
5151 '';
5252
53− users.users.systemd-timesync.uid = config.ids.uids.systemd-timesync;
53+ users.users.systemd-timesync = {
54+ uid = config.ids.uids.systemd-timesync;
55+ group = "systemd-timesync";
56+ };
5457 users.groups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
5558
5659 system.activationScripts.systemd-timesyncd-migration = mkIf (versionOlder config.system.stateVersion "19.09") ''
nixos/tests/systemd-networkd-wireguard.nix+7−4
@@ -1,4 +1,4 @@
1−let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...}: {
1+let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: {
22 imports = [ common/user-account.nix ];
33 systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug";
44 networking.useNetworkd = true;
@@ -7,13 +7,16 @@ let generateNodeConf = { lib, pkgs, config, privkpath, pubk, peerId, nodeId, ...
77 virtualisation.vlans = [ 1 ];
88 environment.systemPackages = with pkgs; [ wireguard-tools ];
99 boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
10+ systemd.tmpfiles.rules = [
11+ "f /run/wg_priv 0640 root systemd-network - ${privk}"
12+ ];
1013 systemd.network = {
1114 enable = true;
1215 netdevs = {
1316 "90-wg0" = {
1417 netdevConfig = { Kind = "wireguard"; Name = "wg0"; };
1518 wireguardConfig = {
16− PrivateKeyFile = privkpath ;
19+ PrivateKeyFile = "/run/wg_priv";
1720 ListenPort = 51820;
1821 FwMark = 42;
1922 };
@@ -53,7 +56,7 @@ in import ./make-test-python.nix ({pkgs, ... }: {
5356 nodes = {
5457 node1 = { pkgs, ... }@attrs:
5558 let localConf = {
56− privkpath = pkgs.writeText "priv.key" "GDiXWlMQKb379XthwX0haAbK6hTdjblllpjGX0heP00=";
59+ privk = "GDiXWlMQKb379XthwX0haAbK6hTdjblllpjGX0heP00=";
5760 pubk = "iRxpqj42nnY0Qz8MAQbSm7bXxXP5hkPqWYIULmvW+EE=";
5861 nodeId = "1";
5962 peerId = "2";
@@ -62,7 +65,7 @@ in import ./make-test-python.nix ({pkgs, ... }: {
6265
6366 node2 = { pkgs, ... }@attrs:
6467 let localConf = {
65− privkpath = pkgs.writeText "priv.key" "eHxSI2jwX/P4AOI0r8YppPw0+4NZnjOxfbS5mt06K2k=";
68+ privk = "eHxSI2jwX/P4AOI0r8YppPw0+4NZnjOxfbS5mt06K2k=";
6669 pubk = "27s0OvaBBdHoJYkH9osZpjpgSOVNw+RaKfboT/Sfq0g=";
6770 nodeId = "2";
6871 peerId = "1";