nixos/openntpd, nixos/ntp: define group, fix after #133166

Changed files
+10 -8
nixos
modules
misc
services
networking
+1 -1
nixos/modules/misc/ids.nix
···
sddm = 175;
tss = 176;
#memcached = 177; removed 2018-01-03
-
ntp = 179;
zabbix = 180;
#redis = 181; removed 2018-01-03
#unifi = 183; dynamically allocated as of 2021-09-17
···
sddm = 175;
tss = 176;
#memcached = 177; removed 2018-01-03
+
#ntp = 179; # dynamically allocated as of 2021-09-17
zabbix = 180;
#redis = 181; removed 2018-01-03
#unifi = 183; dynamically allocated as of 2021-09-17
+6 -6
nixos/modules/services/networking/ntp/ntpd.nix
···
stateDir = "/var/lib/ntp";
-
ntpUser = "ntp";
-
configFile = pkgs.writeText "ntp.conf" ''
driftfile ${stateDir}/ntp.drift
···
${cfg.extraConfig}
'';
-
ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}";
in
···
systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; };
-
users.users.${ntpUser} =
-
{ uid = config.ids.uids.ntp;
description = "NTP daemon user";
home = stateDir;
};
systemd.services.ntpd =
{ description = "NTP Daemon";
···
preStart =
''
mkdir -m 0755 -p ${stateDir}
-
chown ${ntpUser} ${stateDir}
'';
serviceConfig = {
···
stateDir = "/var/lib/ntp";
configFile = pkgs.writeText "ntp.conf" ''
driftfile ${stateDir}/ntp.drift
···
${cfg.extraConfig}
'';
+
ntpFlags = "-c ${configFile} -u ntp:ntp ${toString cfg.extraFlags}";
in
···
systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; };
+
users.users.ntp =
+
{ isSystemUser = true;
+
group = "ntp";
description = "NTP daemon user";
home = stateDir;
};
+
users.groups.ntp = {};
systemd.services.ntpd =
{ description = "NTP Daemon";
···
preStart =
''
mkdir -m 0755 -p ${stateDir}
+
chown ntp ${stateDir}
'';
serviceConfig = {
+3 -1
nixos/modules/services/networking/ntp/openntpd.nix
···
environment.etc."ntpd.conf".text = configFile;
users.users.ntp = {
-
uid = config.ids.uids.ntp;
description = "OpenNTP daemon user";
home = "/var/empty";
};
systemd.services.openntpd = {
description = "OpenNTP Server";
···
environment.etc."ntpd.conf".text = configFile;
users.users.ntp = {
+
isSystemUser = true;
+
group = "ntp";
description = "OpenNTP daemon user";
home = "/var/empty";
};
+
users.groups.ntp = {};
systemd.services.openntpd = {
description = "OpenNTP Server";