Commit d0e369e4 authored by Bjørn Forsman's avatar Bjørn Forsman
Browse files

Revert "nixos/syncthing: missing `--fail` to `curl`" 

This reverts commit a8b8f8f8.

It introduced a failure in the syncthing service, where it hangs at the
curl step, repeatedly printing this:

  l3ijkvb20h5nnffg5q25i4nmcsbf7glx-merge-syncthing-config[1458]: curl: (22) The requested URL returned error: 404
  l3ijkvb20h5nnffg5q25i4nmcsbf7glx-merge-syncthing-config[1458]: curl: (22) The requested URL returned error: 404
  l3ijkvb20h5nnffg5q25i4nmcsbf7glx-merge-syncthing-config[1458]: curl: (22) The requested URL returned error: 404
  [...]

This is unfortunately not detected by `nix-build -A syncthing.tests`.

Ref https://github.com/NixOS/nixpkgs/pull/390742
parent 1ad93cc7

nixos/modules/services/networking/syncthing.nix

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ let 
                >"$RUNTIME_DIRECTORY/api_key"

        do sleep 1; done

        (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers"

        ${pkgs.curl}/bin/curl --fail -sSLk -H "@$RUNTIME_DIRECTORY/headers" \

        ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \

            --retry 1000 --retry-delay 1 --retry-all-errors \

            "$@"

    }