diff options
author | Markus Wotringer <markus@wotringer.de> | 2015-12-04 01:12:25 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-13 15:03:09 +0000 |
commit | 4bc9e8a785b9e8754ca533f64df30a040b195d30 (patch) | |
tree | 67cbcbbe69ade2edbd12fcdfca3caefdc1c302d8 /nixos | |
parent | c2b578386ea6950f23b2085848b3797c37608108 (diff) | |
download | nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.tar nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.tar.gz nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.tar.bz2 nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.tar.lz nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.tar.xz nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.tar.zst nixlib-4bc9e8a785b9e8754ca533f64df30a040b195d30.zip |
elasticsearch2: init at 2.2.0
changes by @globin: * updated 2.1.0 to 2.2.0 * moved to a new derivation closes #11446 Signed-off-by: Robin Gloster <mail@glob.in>
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/search/elasticsearch.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 356cfd409ad4..31332489a784 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -9,6 +9,8 @@ let network.host: ${cfg.listenAddress} network.port: ${toString cfg.port} network.tcp.port: ${toString cfg.tcp_port} + # TODO: find a way to enable security manager + security.manager.enabled: false cluster.name: ${cfg.cluster_name} ${cfg.extraConf} ''; @@ -39,8 +41,8 @@ in { package = mkOption { description = "Elasticsearch package to use."; - default = pkgs.elasticsearch; - defaultText = "pkgs.elasticsearch"; + default = pkgs.elasticsearch2; + defaultText = "pkgs.elasticsearch2"; type = types.package; }; @@ -129,7 +131,9 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; path = [ pkgs.inetutils ]; - environment = { ES_HOME = cfg.dataDir; }; + environment = { + ES_HOME = cfg.dataDir; + }; serviceConfig = { ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}"; User = "elasticsearch"; @@ -137,10 +141,11 @@ in { }; preStart = '' mkdir -m 0700 -p ${cfg.dataDir} - if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi # Install plugins ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins + ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib + if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi ''; postStart = mkBefore '' until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do |