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

nixos/chrony: remove redundant 'initstepslew.servers' option

Browse Source 
This option was added in 6336048c5843ffcbd9fb010e47386adda2cdb913 but it
is essentially a complete duplicate of the existing cfg.servers and
there seems to be no reason to keep maintaining it.

Furthermore, it requires annoying duplication if you try to do option
merging, e.g. merging in sets into your configuration.nix that add
`services.chrony.initstepslew` options will overwrite the servers option
unless you keep it, but that means you just have to duplicate
config.networking.timeServers again anyway which is an implementation
detail!

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2019-02-23 01:21:18 -06:00
parent 83180ea41f
commit b8bda8cb4f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/networking/ntp/chrony.nix
View File

@ -13,7 +13,7 @@ let
${optionalString ${optionalString
(cfg.initstepslew.enabled && (cfg.servers != [])) (cfg.initstepslew.enabled && (cfg.servers != []))
"initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.initstepslew.servers}" "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.servers}"
} }
driftfile ${stateDir}/chrony.drift driftfile ${stateDir}/chrony.drift
@ -48,7 +48,6 @@ in
default = { default = {
enabled = true; enabled = true;
threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s) threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s)
servers = cfg.servers;
}; };
description = '' description = ''
Allow chronyd to make a rapid measurement of the system clock error at Allow chronyd to make a rapid measurement of the system clock error at