summary refs log tree commit diff
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2018-02-27 12:55:11 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2018-03-02 08:48:38 +0100
commit5de8f99f03899f5791447bbcc0e1f3e87cf87868 (patch)
treea53b3e27dc7a3ff5030247a4d79c412240dd69be
parent0e93b0e9ac0201427c3aba05f9a1cc1505672399 (diff)
downloadnixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.tar
nixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.tar.gz
nixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.tar.bz2
nixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.tar.lz
nixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.tar.xz
nixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.tar.zst
nixlib-5de8f99f03899f5791447bbcc0e1f3e87cf87868.zip
nixos/jenkins: ensure postStart follows redirects
Pass the -L flag to curl to make it follow redirects. This fixes an
issue I found when setting up reverse proxy for Jenkins. Without this
fix, the returned HTTP code was stuck at 302, making postStart fail the
service (it expects 200 or 403).
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 0dd59e4fb444..54047a50caa6 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -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
       '';