From b8bda8cb4ff889d8f94b89adac2a884838f8cb09 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sat, 23 Feb 2019 01:21:18 -0600 Subject: nixos/chrony: remove redundant 'initstepslew.servers' option 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 --- nixos/modules/services/networking/ntp/chrony.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nixos/modules') diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 08e58873acad..e2309ef46bc8 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -13,7 +13,7 @@ let ${optionalString (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 @@ -48,7 +48,6 @@ in default = { enabled = true; threshold = 1000; # by default, same threshold as 'ntpd -g' (1000s) - servers = cfg.servers; }; description = '' Allow chronyd to make a rapid measurement of the system clock error at -- cgit 1.4.1