summary refs log tree commit diff
path: root/nixos/modules/services/search
diff options
context:
space:
mode:
authorRickard Nilsson <rickynils@gmail.com>2016-01-18 15:57:52 +0100
committerRickard Nilsson <rickynils@gmail.com>2016-01-18 15:57:59 +0100
commitce543ebf27a619ba62e16b95a8090800a7050c53 (patch)
treef6b3995440ec6017ddb0d0d6aa32f37a30c7439d /nixos/modules/services/search
parentd6f9f135120301f2d297d52336b5182e7ebc6122 (diff)
downloadnixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.tar
nixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.tar.gz
nixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.tar.bz2
nixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.tar.lz
nixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.tar.xz
nixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.tar.zst
nixpkgs-ce543ebf27a619ba62e16b95a8090800a7050c53.zip
elasticsearch: Fix some startup warnings
Diffstat (limited to 'nixos/modules/services/search')
-rw-r--r--nixos/modules/services/search/elasticsearch.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index ea0cf1dcd78..356cfd409ad 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -128,6 +128,7 @@ in {
       description = "Elasticsearch Daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
+      path = [ pkgs.inetutils ];
       environment = { ES_HOME = cfg.dataDir; };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
@@ -139,8 +140,7 @@ in {
         if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
 
         # Install plugins
-        rm ${cfg.dataDir}/plugins || true
-        ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins
+        ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
       '';
       postStart = mkBefore ''
         until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do