From 12bbb0fd7bd2d88ee232cf505b917f3873be0f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Na=C3=AFm=20Favier?= <n@monade.li>
Date: Sun, 1 Aug 2021 14:44:46 +0200
Subject: [PATCH] nixos/syncthing: fix curl not retrying on network errors

---
 nixos/modules/services/networking/syncthing.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 63b249df735e..2e92fe51e90a 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -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" ];