about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2019-02-23 01:21:18 -0600
committerAustin Seipp <aseipp@pobox.com>2019-09-12 11:45:51 -0500
commitb8bda8cb4ff889d8f94b89adac2a884838f8cb09 (patch)
treef69347cd48923000cb31bbad00b15ac0864e7772 /nixos/modules
parent83180ea41f79f38d4f91923ff2480fa69393cb19 (diff)
downloadnixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.tar
nixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.tar.gz
nixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.tar.bz2
nixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.tar.lz
nixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.tar.xz
nixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.tar.zst
nixlib-b8bda8cb4ff889d8f94b89adac2a884838f8cb09.zip
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 <aseipp@pobox.com>
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/networking/ntp/chrony.nix3
1 files changed, 1 insertions, 2 deletions
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