diff options
| author | Naïm Favier <n@monade.li> | 2023-06-23 20:12:19 +0200 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2023-06-23 20:19:51 +0200 |
| commit | 9a9ded1675b9cba302c50ee1d0616199cc4bc321 (patch) | |
| tree | f54abb26233e809a30b4f47675fbfecf6f07c7e1 /nixos/modules/services/networking/syncthing.nix | |
| parent | 1fa8dad8e74fb92edc8609c11df6d86cb9d897e7 (diff) | |
| download | nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.tar nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.tar.gz nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.tar.bz2 nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.tar.lz nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.tar.xz nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.tar.zst nixpkgs-9a9ded1675b9cba302c50ee1d0616199cc4bc321.zip | |
nixos/syncthing: fix escaping
Diffstat (limited to 'nixos/modules/services/networking/syncthing.nix')
| -rw-r--r-- | nixos/modules/services/networking/syncthing.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 3d41fe4013e..69b45eb02d1 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -55,9 +55,9 @@ let # generate the new config by merging with the NixOS config options new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { - "devices": (${builtins.toJSON devices}${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}), - "folders": (${builtins.toJSON folders}${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"}) - } * ${builtins.toJSON cfg.extraOptions}') + "devices": ('${escapeShellArg (builtins.toJSON devices)}'${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}), + "folders": ('${escapeShellArg (builtins.toJSON folders)}'${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"}) + } * '${escapeShellArg (builtins.toJSON cfg.extraOptions)}) # send the new config curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config |