commit: 426ed349ab5ba38a3a3a2266a2d5199ad2d206a4 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Thu May 24 12:04:07 2018 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Fri May 25 13:14:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426ed349
app-misc/elasticsearch: allow to override LOG_DIR Closes: https://bugs.gentoo.org/654630 Package-Manager: Portage-2.3.38, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/8547 app-misc/elasticsearch/files/elasticsearch.init.3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3 index ab086197ec9..cd89acd9f99 100644 --- a/app-misc/elasticsearch/files/elasticsearch.init.3 +++ b/app-misc/elasticsearch/files/elasticsearch.init.3 @@ -8,11 +8,11 @@ ES_INSTANCE=${SVCNAME#*.} if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}" CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}" - LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}" + DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}" else ES_BASE_PATH="/var/lib/elasticsearch/_default" CONF_DIR="/etc/elasticsearch" - LOG_DIR="/var/log/elasticsearch/_default" + DEFAULT_LOG_DIR="/var/log/elasticsearch/_default" fi ES_HOME=${ES_HOME:="/usr/share/elasticsearch"} @@ -23,6 +23,7 @@ MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536} MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144} DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"} +LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"} if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
