diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2014-03-21 12:02:35 +0100 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2014-03-21 12:04:52 +0100 |
| commit | 6a60fc3bddf43fb33d50462e511cfdbc0c57f000 (patch) | |
| tree | 4c0c2df1b7dda67eec0c80211abb260dba56c960 /nixos | |
| parent | 23464b3241454ad9d29e20fc078a54fcf59dc5ef (diff) | |
| download | nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.tar nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.tar.gz nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.tar.bz2 nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.tar.lz nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.tar.xz nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.tar.zst nixpkgs-6a60fc3bddf43fb33d50462e511cfdbc0c57f000.zip | |
solr module: Activate JSP support in Winstone
Required by older versions of solr. The JSP support in Winstone seems spotty, but at one point we'll switch over to Jetty instead.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/search/solr.nix | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index eab18c4229b..a79b1194c80 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -6,6 +6,26 @@ let cfg = config.services.solr; + # Assemble all jars needed for solr + solrJars = pkgs.stdenv.mkDerivation { + name = "solr-jars"; + + src = pkgs.fetchurl { + url = http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/bin/apache-tomcat-5.5.36.tar.gz; + sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p"; + }; + + buildPhases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/lib + cp common/lib/*.jar $out/lib/ + ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/ + ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/ + ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/ + ''; + }; + in { options = { @@ -101,7 +121,8 @@ in { inherit (cfg) user group javaPackage; warFile = "${cfg.solrPackage}/lib/solr.war"; extraOptions = [ - "--commonLibFolder=${cfg.solrPackage}/lib/ext" + "--commonLibFolder=${solrJars}/lib" + "--useJasper" ] ++ cfg.extraWinstoneOptions; extraJavaOptions = [ "-Dsolr.solr.home=${cfg.solrHome}" |