diff options
| author | happysalada <raphael@megzari.com> | 2021-08-31 12:43:28 +0900 |
|---|---|---|
| committer | Raphael Megzari <raphael@megzari.com> | 2021-09-02 10:57:02 +0900 |
| commit | 4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8 (patch) | |
| tree | 4d58778168aa52ae6245c36c61e22702657f5cbf /nixos/modules/services | |
| parent | d58fa9e445d171ba8a735165dc60706d54e9cc4f (diff) | |
| download | nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.tar nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.tar.gz nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.tar.bz2 nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.tar.lz nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.tar.xz nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.tar.zst nixpkgs-4ddc5c6b2addbf03ee21fa5b51de15b2cded11c8.zip | |
elasticsearch: remove logic for version less than 6
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/search/elasticsearch.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index ed566d97839..440f34b3dc5 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -5,8 +5,6 @@ with lib; let cfg = config.services.elasticsearch; - es6 = builtins.compareVersions cfg.package.version "6" >= 0; - esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} @@ -147,9 +145,7 @@ in path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; - ES_JAVA_OPTS = toString (optional (!es6) [ "-Des.path.conf=${configDir}" ] - ++ cfg.extraJavaOptions); - } // optionalAttrs es6 { + ES_JAVA_OPTS = toString cfg.extraJavaOptions; ES_PATH_CONF = configDir; }; serviceConfig = { @@ -188,7 +184,7 @@ in rm -f "${configDir}/logging.yml" cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} mkdir -p ${configDir}/scripts - ${optionalString es6 "cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options"} + cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options # redirect jvm logs to the data directory mkdir -m 0700 -p ${cfg.dataDir}/logs ${pkgs.sd}/bin/sd 'logs/gc.log' '${cfg.dataDir}/logs/gc.log' ${configDir}/jvm.options \ |