diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-07-15 16:57:16 +0200 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2016-07-15 17:18:44 +0200 |
| commit | 8c2d8884013e6d8e929b35ba46e85e27cdb0ad33 (patch) | |
| tree | 190bdd2619cdf4bc470fafe7c24284d7622092e5 | |
| parent | e228023b14541c4d0cccba397fe9b647aca61832 (diff) | |
| download | nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.tar nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.tar.gz nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.tar.bz2 nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.tar.lz nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.tar.xz nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.tar.zst nixlib-8c2d8884013e6d8e929b35ba46e85e27cdb0ad33.zip | |
jenkins: move $out/{lib => webapps}/jenkins.war
As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.
Commit 4075c10a59af455db2012beb313453662f09dad0
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
| -rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/jenkins/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 7da49fa0aaab..4edbbf59a42c 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -154,7 +154,7 @@ in { ''; script = '' - ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/lib/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ ${concatStringsSep " " cfg.extraOptions} diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index cbc2b76d8acc..e7355d167d92 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { }; buildCommand = '' - mkdir -p "$out/lib" - cp "$src" "$out/lib/jenkins.war" + mkdir -p "$out/webapps" + cp "$src" "$out/webapps/jenkins.war" ''; meta = with stdenv.lib; { |