···

       
48
       
48
       
 
       
        '';

     

       
49
       
49
       
 
       
      };

     

       
50
       
50
       
 
       


     

       
51
       
51
       
-
       
      host = mkOption {

     

       
51
       
51
       
+
       
      listenAddress = mkOption {

     

       
52
       
52
       
 
       
        default = "0.0.0.0";

     

       
53
       
53
       
 
       
        example = "localhost";

     

       
54
       
54
       
 
       
        type = types.str;

     
···

       
156
       
156
       
 
       
      '';

     

       
157
       
157
       
 
       


     

       
158
       
158
       
 
       
      script = ''

     

       
159
       
159
       
-
       
        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpListenAddress=${cfg.host} \

     

       
159
       
159
       
+
       
        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins} --httpListenAddress=${cfg.listenAddress} \

     

       
160
       
160
       
 
       
                                                  --httpPort=${toString cfg.port} \

     

       
161
       
161
       
 
       
                                                  --prefix=${cfg.prefix} \

     

       
162
       
162
       
 
       
                                                  ${concatStringsSep " " cfg.extraOptions}

     

       
163
       
163
       
 
       
      '';

     

       
164
       
164
       
 
       


     

       
165
       
165
       
 
       
      postStart = ''

     

       
166
       
166
       
-
       
        until ${pkgs.curl}/bin/curl -s -L ${cfg.host}:${toString cfg.port}${cfg.prefix} ; do

     

       
166
       
166
       
+
       
        until ${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} ; do

     

       
167
       
167
       
 
       
          sleep 10

     

       
168
       
168
       
 
       
        done

     

       
169
       
169
       
 
       
        while true ; do

     

       
170
       
170
       
-
       
          index=`${pkgs.curl}/bin/curl -s -L ${cfg.host}:${toString cfg.port}${cfg.prefix}`

     

       
170
       
170
       
+
       
          index=`${pkgs.curl}/bin/curl -s -L ${cfg.listenAddress}:${toString cfg.port}${cfg.prefix}`

     

       
171
       
171
       
 
       
          if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||

     

       
172
       
172
       
 
       
                  "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then

     

       
173
       
173
       
 
       
            exit 0

     

···

       
144
       
144
       
 
       
            done

     

       
145
       
145
       
 
       


     

       
146
       
146
       
 
       
            echo "Asking Jenkins to reload config"

     

       
147
       
147
       
-
       
            curl --silent -X POST http://${jenkinsCfg.host}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload

     

       
147
       
147
       
+
       
            curl --silent -X POST http://${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload

     

       
148
       
148
       
 
       
          '';

     

       
149
       
149
       
 
       
      serviceConfig = {

     

       
150
       
150
       
 
       
        User = jenkinsCfg.user;