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 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
This commit is contained in:
Bjørn Forsman 2016-07-15 16:57:16 +02:00
parent e228023b14
commit 8c2d888401
2 changed files with 3 additions and 3 deletions

View File

@ -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}

View File

@ -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; {