diff options
author | Naïm Favier <n@monade.li> | 2023-05-17 16:13:57 +0200 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2023-05-17 16:53:01 +0200 |
commit | 40a2df0fb0e2c194ded70b7d95a064b1bbf676e7 (patch) | |
tree | da3d815483aa09020611444f25847e586f4671ac /nixos/modules/services | |
parent | 47de2ab418dd31fa24e551051c0acc8b4a99c13b (diff) |
nixos/syncthing: fixup #226088
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/networking/syncthing.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index b5ebda6da045f..a8e6b0fcf6fbe 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -13,7 +13,11 @@ let deviceID = device.id; }) cfg.settings.devices; - folders = mapAttrsToList (_: folder: folder // { + folders = mapAttrsToList (_: folder: folder // + throwIf (folder?rescanInterval || folder?watch || folder?watchDelay) '' + The options services.syncthing.settings.folders.<name>.{rescanInterval,watch,watchDelay} + were removed. Please use, respectively, {rescanIntervalS,fsWatcherEnabled,fsWatcherDelayS} instead. + '' { devices = map (device: if builtins.isString device then { deviceId = cfg.settings.devices.${device}.id; } @@ -121,10 +125,9 @@ in { description = mdDoc '' The options element contains all other global configuration options ''; - type = types.attrsOf (types.submodule ({ name, ... }: { + type = types.submodule ({ name, ... }: { freeformType = settingsFormat.type; options = { - localAnnounceEnabled = mkOption { type = types.bool; default = true; @@ -176,7 +179,7 @@ in { ''; }; }; - })); + }); }; # device settings @@ -344,6 +347,7 @@ in { ] ''; type = with types; nullOr (submodule { + freeformType = settingsFormat.type; options = { type = mkOption { type = enum [ "external" "simple" "staggered" "trashcan" ]; @@ -609,9 +613,7 @@ in { ]; }; }; - syncthing-init = mkIf ( - cfg.settings.devices != {} || cfg.folders != {} || cfg.extraOptions != {} - ) { + syncthing-init = mkIf (cfg.settings != {}) { description = "Syncthing configuration updater"; requisite = [ "syncthing.service" ]; after = [ "syncthing.service" ]; |