diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2018-01-14 10:40:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-14 10:40:50 +0100 |
commit | ee4e6ebbfaad09a20f8b447e084444449583f505 (patch) | |
tree | e072452a8b823e6e25fa238bfd03bc9df923cc75 /nixos/modules | |
parent | 08492b31d128501927862844b370b9facca17273 (diff) | |
parent | e8e88c43f61fd367e5c856bc29166cab5b29e048 (diff) |
Merge pull request #32822 from LumiGuide/elk6
ELK: 5.6.1 -> 5.6.5 & add ELK 6.1.0
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/search/elasticsearch.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index c51dd5d946550..adef500b7b5cd 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -6,6 +6,7 @@ let cfg = config.services.elasticsearch; es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0; + es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0; esConfig = '' network.host: ${cfg.listenAddress} @@ -92,8 +93,6 @@ in { node.name: "elasticsearch" node.master: true node.data: false - index.number_of_shards: 5 - index.number_of_replicas: 1 ''; }; @@ -165,7 +164,10 @@ in { path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; - ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions); + ES_JAVA_OPTS = toString ( optional (!es6) [ "-Des.path.conf=${configDir}" ] + ++ cfg.extraJavaOptions); + } // optionalAttrs es6 { + ES_PATH_CONF = configDir; }; serviceConfig = { ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}"; |