summary refs log tree commit diff
path: root/nixos/modules/services/continuous-integration/jenkins/default.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-12-23 23:17:03 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-12-23 23:48:49 +0100
commitc6b251f5d549f8d3dd877d0b086ae4f876bc5a2b (patch)
treef67d6bfe91a87b7a0dac5f5ca0686d9b59241e28 /nixos/modules/services/continuous-integration/jenkins/default.nix
parent77affc495f514ac81343c10c92340c64ba6a3437 (diff)
downloadnixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.tar
nixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.tar.gz
nixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.tar.bz2
nixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.tar.lz
nixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.tar.xz
nixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.tar.zst
nixpkgs-c6b251f5d549f8d3dd877d0b086ae4f876bc5a2b.zip
nixos/jenkins: rename option 'host' to 'listenAddress'
I think the name 'listenAddress' is more descriptive. Other NixOS
modules that define 'host' either use it as listen address or as address
a client connects to. listenAddress is unambiguous.

The addition of 'host' was added earlier today[1], so not bothering with
./nixos/modules/rename.nix.

[1]: 44ea18499710049e ("jenkins ci enhancement: add port and prefix option")
Diffstat (limited to 'nixos/modules/services/continuous-integration/jenkins/default.nix')
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 3b76ada72bb..9bffd97628a 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -48,7 +48,7 @@ in {
         '';
       };
 
-      host = mkOption {
+      listenAddress = mkOption {
         default = "0.0.0.0";
         example = "localhost";
         type = types.str;
@@ -156,18 +156,18 @@ in {
       '';
 
       script = ''
-        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpListenAddress=${cfg.host} \
+        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
                                                   ${concatStringsSep " " cfg.extraOptions}
       '';
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -L ${cfg.host}:${toString cfg.port}${cfg.prefix} ; do
+        until ${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do
           sleep 10
         done
         while true ; do
-          index=`${pkgs.curl}/bin/curl -s -L ${cfg.host}:${toString cfg.port}${cfg.prefix}`
+          index=`${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}`
           if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
                   "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
             exit 0