gentoo resync : 25.05.2018

4 files changed, 3 insertions, 221 deletions

diff --git a/app-misc/elasticsearch/files/elasticsearch.conf b/app-misc/elasticsearch/files/elasticsearch.conf
deleted file mode 100644
index 444ec53ae335..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-################################
-# Elasticsearch
-################################
-
-# Elasticsearch home directory
-#ES_HOME=/usr/share/elasticsearch
-
-# Elasticsearch Java path
-#JAVA_HOME=
-
-# Elasticsearch configuration directory
-#CONF_DIR=/etc/elasticsearch
-
-# Elasticsearch data directory
-#DATA_DIR=/var/lib/elasticsearch
-
-# Elasticsearch logs directory
-#LOG_DIR=/var/log/elasticsearch
-
-# Elasticsearch PID directory
-#PID_DIR=/run/elasticsearch
-
-# Additional Java OPTS
-#ES_JAVA_OPTS=
-
-################################
-# Elasticsearch service
-################################
-
-# When executing the init script, this user will be used to run the elasticsearch service.
-# The default value is 'elasticsearch' and is declared in the init.d file.
-# Note that this setting is only used by the init script. If changed, make sure that
-# the configured user can read and write into the data, work, plugins and log directories.
-# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
-#ES_USER=elasticsearch
-#ES_GROUP=elasticsearch
-
-# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
-#ES_STARTUP_SLEEP_TIME=5
-
-################################
-# System properties
-################################
-
-# Specifies the maximum file descriptor number that can be opened by this process
-# When using Systemd, this setting is ignored and the LimitNOFILE defined in
-# /usr/lib/systemd/system/elasticsearch.service takes precedence
-#MAX_OPEN_FILES=65536
-
-# The maximum number of bytes of memory that may be locked into RAM
-# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
-# in elasticsearch.yml.
-# When using Systemd, the LimitMEMLOCK property must be set
-# in /usr/lib/systemd/system/elasticsearch.service
-#MAX_LOCKED_MEMORY=unlimited
-
-# Maximum number of VMA (Virtual Memory Areas) a process can own
-# When using Systemd, this setting is ignored and the 'vm.max_map_count'
-# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
-#MAX_MAP_COUNT=262144
diff --git a/app-misc/elasticsearch/files/elasticsearch.init b/app-misc/elasticsearch/files/elasticsearch.init
deleted file mode 100644
index a9200d58ca0b..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-ES_INSTANCE=${SVCNAME#*.}
-PID_DIR=${PID_DIR:="/run/elasticsearch"}
-
-if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
-	PIDFILE="${PID_DIR}/elasticsearch.${ES_INSTANCE}.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
-	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
-	LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
-else
-	PIDFILE="${PID_DIR}/elasticsearch.pid"
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	CONF_DIR="/etc/elasticsearch"
-	LOG_DIR="/var/log/elasticsearch/_default"
-fi
-
-ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
-ES_USER=${ES_USER:="elasticsearch"}
-ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
-
-if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
-    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
-fi
-
-export ES_INCLUDE
-export JAVA_HOME
-export JAVA_OPTS
-export ES_JVM_OPTIONS
-export ES_JAVA_OPTS
-export ES_STARTUP_SLEEP_TIME
-
-server_command="/usr/share/elasticsearch/bin/elasticsearch"
-server_args="-d -p ${PIDFILE} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_DIR}"
-
-depend() {
-	use net
-}
-
-start() {
-	local conf
-	local conf_file
-	for conf in elasticsearch.yml; do
-		conf_file="${CONF_DIR}/${conf}"
-		if [ ! -f "${conf_file}" ]; then
-			eerror "${conf_file} must be copied into place"
-			return 1
-		fi
-	done
-
-	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
-		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -n "${MAX_LOCKED_MEMORY}" ]; then
-		ulimit -l "${MAX_LOCKED_MEMORY}"
-	fi
-
-	if [ -n "${MAX_OPEN_FILES}" ]; then
-		ulimit -n "${MAX_OPEN_FILES}"
-	fi
-
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${PID_DIR}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-
-	start-stop-daemon --start \
-		--background \
-		--chdir "${ES_HOME}" \
-		--user="${ES_USER}" \
-		--pidfile="${PIDFILE}" \
-		--exec ${server_command} -- ${server_args}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop \
-		--pidfile=${PIDFILE} \
-		--user="${ES_USER}" \
-		--retry=TERM/20
-	eend $?
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.1 b/app-misc/elasticsearch/files/elasticsearch.init.1
deleted file mode 100644
index c44671c95d1b..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init.1
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/openrc-run
-
-name="Elasticsearch"
-description="Elasticsearch Server"
-
-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}"
-else
-	ES_BASE_PATH="/var/lib/elasticsearch/_default"
-	CONF_DIR="/etc/elasticsearch"
-	LOG_DIR="/var/log/elasticsearch/_default"
-fi
-
-ES_DATA_PATH="${ES_BASE_PATH}/data"
-ES_WORK_PATH="${ES_BASE_PATH}/work"
-
-ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
-ES_USER=${ES_USER:="elasticsearch"}
-ES_GROUP=${ES_GROUP:="elasticsearch"}
-ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
-MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
-
-DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
-
-if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
-    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
-fi
-
-export ES_INCLUDE
-export JAVA_HOME
-export JAVA_OPTS
-export ES_JVM_OPTIONS
-export ES_JAVA_OPTS
-export ES_STARTUP_SLEEP_TIME
-export ES_PATH_CONF="${CONF_DIR}"
-
-pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
-
-command="/usr/share/elasticsearch/bin/elasticsearch"
-command_args="-d --pidfile=${pidfile} -Des.default.path.conf=\"${CONF_DIR}\" -Des.default.path.data=\"${ES_DATA_PATH}\" -Des.default.path.work=\"${ES_WORK_PATH}\" -Des.default.path.logs=\"${LOG_DIR}\""
-command_user="${ES_USER}:${ES_GROUP}"
-required_files="${CONF_DIR}/elasticsearch.yml"
-retry="TERM/30/KILL/30"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
-		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
-	fi
-
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
-	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
-}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3
index ab086197ec91..cd89acd9f998 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"