Merge commit '618ac29687a650d854c8bea7efd4490387589ce2' into staging

2018-03-03 22:40:32 +02:00
parent a5913ce272 618ac29687
commit 1e107443ad
101 changed files with 2988 additions and 748 deletions
@@ -208,7 +208,7 @@ in {
      '';

      postStart = ''
-        until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
+        until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do
          sleep 1
        done
      '';