public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/elasticsearch: remove es5 version guard

Browse Source
This commit is contained in:
Jörg Thalheim
2018-08-03 11:50:10 +01:00
parent 806ab02d95
commit cd62790201
1 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/search/elasticsearch.nix
+16 -37
View File
@@ -5,22 +5,14 @@ with lib;
let let
cfg = config.services.elasticsearch; 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; es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0;
esConfig = '' esConfig = ''
network.host: ${cfg.listenAddress} network.host: ${cfg.listenAddress}
cluster.name: ${cfg.cluster_name} cluster.name: ${cfg.cluster_name}
${if es5 then '' http.port: ${toString cfg.port}
http.port: ${toString cfg.port} transport.tcp.port: ${toString cfg.tcp_port}
transport.tcp.port: ${toString cfg.tcp_port}
'' else ''
network.port: ${toString cfg.port}
network.tcp.port: ${toString cfg.tcp_port}
# TODO: find a way to enable security manager
security.manager.enabled: false
''}
${cfg.extraConf} ${cfg.extraConf}
''; '';
@@ -32,7 +24,7 @@ let
text = esConfig; text = esConfig;
}; };
loggingConfigFilename = if es5 then "log4j2.properties" else "logging.yml"; loggingConfigFilename = "log4j2.properties";
loggingConfigFile = pkgs.writeTextFile { loggingConfigFile = pkgs.writeTextFile {
name = loggingConfigFilename; name = loggingConfigFilename;
text = cfg.logging; text = cfg.logging;
@@ -41,8 +33,7 @@ let
esPlugins = pkgs.buildEnv { esPlugins = pkgs.buildEnv {
name = "elasticsearch-plugins"; name = "elasticsearch-plugins";
paths = cfg.plugins; paths = cfg.plugins;
# Elasticsearch 5.x won't start when the plugins directory does not exist postBuild = "${pkgs.coreutils}/bin/mkdir -p $out/plugins";
postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/plugins" else "";
}; };
in { in {
@@ -100,30 +91,18 @@ in {
logging = mkOption { logging = mkOption {
description = "Elasticsearch logging configuration."; description = "Elasticsearch logging configuration.";
default = default = ''
if es5 then '' logger.action.name = org.elasticsearch.action
logger.action.name = org.elasticsearch.action logger.action.level = info
logger.action.level = info
appender.console.type = Console appender.console.type = Console
appender.console.name = console appender.console.name = console
appender.console.layout.type = PatternLayout appender.console.layout.type = PatternLayout
appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
rootLogger.level = info rootLogger.level = info
rootLogger.appenderRef.console.ref = console rootLogger.appenderRef.console.ref = console
'' else '' '';
rootLogger: INFO, console
logger:
action: INFO
com.amazonaws: WARN
appender:
console:
type: console
layout:
type: consolePattern
conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
'';
type = types.str; type = types.str;
}; };
@@ -204,9 +183,9 @@ in {
cp ${elasticsearchYml} ${configDir}/elasticsearch.yml cp ${elasticsearchYml} ${configDir}/elasticsearch.yml
# Make sure the logging configuration for old elasticsearch versions is removed: # Make sure the logging configuration for old elasticsearch versions is removed:
rm -f ${if es5 then "${configDir}/logging.yml" else "${configDir}/log4j2.properties"} rm -f "${configDir}/logging.yml"
cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename}
${optionalString es5 "mkdir -p ${configDir}/scripts"} mkdir -p ${configDir}/scripts
${optionalString es6 "cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options"} ${optionalString es6 "cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options"}
if [ "$(id -u)" = 0 ]; then chown -R elasticsearch:elasticsearch ${cfg.dataDir}; fi if [ "$(id -u)" = 0 ]; then chown -R elasticsearch:elasticsearch ${cfg.dataDir}; fi