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/.
This commit is contained in:
parent
e228023b14
commit
8c2d888401
@ -154,7 +154,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
script = ''
|
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} \
|
--httpPort=${toString cfg.port} \
|
||||||
--prefix=${cfg.prefix} \
|
--prefix=${cfg.prefix} \
|
||||||
${concatStringsSep " " cfg.extraOptions}
|
${concatStringsSep " " cfg.extraOptions}
|
||||||
|
@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p "$out/lib"
|
mkdir -p "$out/webapps"
|
||||||
cp "$src" "$out/lib/jenkins.war"
|
cp "$src" "$out/webapps/jenkins.war"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user