Unverified Commit 3b4f4560 authored by Lassulus's avatar Lassulus Committed by GitHub
Browse files

Merge pull request #132312 from ncfavier/syncthing-init 

nixos/syncthing: fix curl not retrying on network errors
parents c649b936 12bbb0fd

nixos/modules/services/networking/syncthing.nix

+4 −7
Original line number Diff line number Diff line
@@ -37,13 +37,9 @@ let 
    do sleep 1; done



    curl() {

        while

            ${pkgs.curl}/bin/curl -Ss -H "X-API-Key: $api_key" \

                --retry 100 --retry-delay 1 --retry-connrefused "$@"

            status=$?

            [ "$status" -eq 52 ] # retry on empty reply from server

        do sleep 1; done

        return "$status"

        ${pkgs.curl}/bin/curl -sS -H "X-API-Key: $api_key" \

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

            "$@"

    }



    # query the old config
@@ -547,6 +543,7 @@ in { 
        cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {}

      ) {

        description = "Syncthing configuration updater";

        requisite = [ "syncthing.service" ];

        after = [ "syncthing.service" ];

        wantedBy = [ "multi-user.target" ];