Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 654630 | Differences between
and this patch

Collapse All | Expand All

(-)a/elasticsearch (-2 / +3 lines)
Lines 8-18 Link Here
8
if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
8
if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
9
	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
9
	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
10
	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
10
	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
11
	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
11
	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
12
else
12
else
13
	ES_BASE_PATH="/var/lib/elasticsearch/_default"
13
	ES_BASE_PATH="/var/lib/elasticsearch/_default"
14
	CONF_DIR="/etc/elasticsearch"
14
	CONF_DIR="/etc/elasticsearch"
15
	LOG_DIR="/var/log/elasticsearch/_default"
15
	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
16
fi
16
fi
17
17
18
ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
18
ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
Lines 23-28 Link Here
23
MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
23
MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
24
24
25
DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
25
DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
26
LOG_DIR=${LOG_DIR:=$DEFAULT_LOG_DIR}
26
27
27
if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
28
if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
28
    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
29
    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"

Return to bug 654630