about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hausmann <ph_git@314.ch>2016-04-29 12:01:13 +0200
committerPhilipp Hausmann <ph_git@314.ch>2016-04-29 12:59:50 +0200
commit7d7380b0110d21ff208a06fe7c930783f90c6944 (patch)
tree002e1fb67dff2121b545eb2d1fe69f1e01290637
parent90d7041ce4d270bbcf0efefd1d1e42c097c1335d (diff)
downloadnixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.tar
nixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.tar.gz
nixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.tar.bz2
nixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.tar.lz
nixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.tar.xz
nixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.tar.zst
nixlib-7d7380b0110d21ff208a06fe7c930783f90c6944.zip
elasticsearch: Install elastic search modules properly, fixes groovy script support.
-rw-r--r--nixos/modules/services/search/elasticsearch.nix1
-rw-r--r--pkgs/servers/search/elasticsearch/2.x.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index c51a42b8e9c1..17ac8fe7e245 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -145,6 +145,7 @@ in {
         # Install plugins
         ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
         ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
+        ln -sfT ${cfg.package}/modules ${cfg.dataDir}/modules
         if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
       '';
       postStart = mkBefore ''
diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
index 33a052673958..9495106ea00a 100644
--- a/pkgs/servers/search/elasticsearch/2.x.nix
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    cp -R bin config lib $out
+    cp -R bin config lib modules $out
 
     # don't want to have binary with name plugin
     mv $out/bin/plugin $out/bin/elasticsearch-plugin