summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-05-03 22:27:51 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-05-03 23:12:45 +0200
commit78b6e8c3199c1ce8ad4744cb90b47e94739083da (patch)
tree20e45d30f8101852e0c362ab8273543ad624e04d /nixos/modules/services
parent51e5beca4267d4138e9ac8babb744a65f8c4bed0 (diff)
downloadnixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.tar
nixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.tar.gz
nixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.tar.bz2
nixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.tar.lz
nixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.tar.xz
nixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.tar.zst
nixlib-78b6e8c3199c1ce8ad4744cb90b47e94739083da.zip
jenkins service: improve curl call in postStart
* Perform HTTP HEAD request instead of full GET (lighter weight)
* Don't log output of curl to the journal (it's noise/debug)
* Use explicit http:// URL scheme
* Reduce poll interval from 10s to 2s (respond to state changes
  quicker). Probably not relevant on boot (lots of services compete for
  the CPU), but online service restarts/reloads should be quicker.
* Pass --fail to curl (should be more robust against false positives)
* Use 4 space indent for shell code.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index d30b27e9df4d..4a6ffb9c2616 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -161,8 +161,8 @@ in {
       '';
 
       postStart = ''
-        until ${pkgs.curl.bin}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do
-          sleep 10
+        until ${pkgs.curl.bin}/bin/curl -s -L --fail --head http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} >/dev/null; do
+            sleep 2
         done
       '';