From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/elasticsearch-systemd-pre-exec | 7 --- app-misc/elasticsearch/files/elasticsearch.conf.2 | 59 ------------------- app-misc/elasticsearch/files/elasticsearch.conf.3 | 62 -------------------- app-misc/elasticsearch/files/elasticsearch.init.2 | 60 ------------------- app-misc/elasticsearch/files/elasticsearch.init.3 | 62 -------------------- app-misc/elasticsearch/files/elasticsearch.init.4 | 67 ---------------------- app-misc/elasticsearch/files/elasticsearch.service | 53 ----------------- .../elasticsearch/files/elasticsearch.service.2 | 51 ---------------- .../elasticsearch/files/elasticsearch.sysctl.d | 1 - .../elasticsearch/files/elasticsearch.tmpfiles.d | 1 - 10 files changed, 423 deletions(-) delete mode 100755 app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec delete mode 100644 app-misc/elasticsearch/files/elasticsearch.conf.2 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.conf.3 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.init.2 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.init.3 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.init.4 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.service delete mode 100644 app-misc/elasticsearch/files/elasticsearch.service.2 delete mode 100644 app-misc/elasticsearch/files/elasticsearch.sysctl.d delete mode 100644 app-misc/elasticsearch/files/elasticsearch.tmpfiles.d (limited to 'app-misc/elasticsearch/files') diff --git a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec deleted file mode 100755 index a51d639bf7d4..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# CONF_FILE setting was removed -if [ ! -z "$CONF_FILE" ]; then - echo "CONF_FILE setting is no longer supported. elasticsearch.yml must be placed in the config directory and cannot be renamed." - exit 1 -fi diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.2 b/app-misc/elasticsearch/files/elasticsearch.conf.2 deleted file mode 100644 index e802448a86ad..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.conf.2 +++ /dev/null @@ -1,59 +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 - -# 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 - -rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES" diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.3 b/app-misc/elasticsearch/files/elasticsearch.conf.3 deleted file mode 100644 index 70c052a64cce..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.conf.3 +++ /dev/null @@ -1,62 +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 - -# 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 - -# https://www.elastic.co/guide/en/elasticsearch/reference/master/max-number-of-threads.html -MAX_THREADS=4096 - -rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES -u $MAX_THREADS" diff --git a/app-misc/elasticsearch/files/elasticsearch.init.2 b/app-misc/elasticsearch/files/elasticsearch.init.2 deleted file mode 100644 index 6e572c58da25..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.init.2 +++ /dev/null @@ -1,60 +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_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 - -pidfile="/run/elasticsearch/${RC_SVCNAME}.pid" - -command="/usr/share/elasticsearch/bin/elasticsearch" -command_args="--daemonize --pidfile=${pidfile} -Edefault.path.logs=${LOG_DIR} -Edefault.path.data=${DATA_DIR} -Edefault.path.conf=${CONF_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 deleted file mode 100644 index cd89acd9f998..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.init.3 +++ /dev/null @@ -1,62 +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}" - DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}" -else - ES_BASE_PATH="/var/lib/elasticsearch/_default" - CONF_DIR="/etc/elasticsearch" - DEFAULT_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"} -LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"} - -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="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_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.4 b/app-misc/elasticsearch/files/elasticsearch.init.4 deleted file mode 100644 index ac3027766103..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.init.4 +++ /dev/null @@ -1,67 +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}" - DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}" -else - ES_BASE_PATH="/var/lib/elasticsearch/_default" - CONF_DIR="/etc/elasticsearch" - DEFAULT_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"} -LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"} - -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="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_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}" - - # fails to start without keystore - if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then - "${ES_HOME}/bin/elasticsearch-keystore" create - fi -} diff --git a/app-misc/elasticsearch/files/elasticsearch.service b/app-misc/elasticsearch/files/elasticsearch.service deleted file mode 100644 index 927acef5ee88..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.service +++ /dev/null @@ -1,53 +0,0 @@ -[Unit] -Description=Elasticsearch -Documentation=http://www.elastic.co -Wants=network.target -After=network.target - -[Service] -Environment=ES_HOME=/usr/share/elasticsearch -Environment=CONF_DIR=/etc/elasticsearch -Environment=DATA_DIR=/var/lib/elasticsearch -Environment=LOG_DIR=/var/log/elasticsearch -Environment=PID_DIR=/run/elasticsearch -EnvironmentFile=-/etc/conf.d/elasticsearch - -WorkingDirectory=/usr/share/elasticsearch - -User=elasticsearch -Group=elasticsearch - -ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec - -ExecStart=/usr/share/elasticsearch/bin/elasticsearch \ - -p ${PID_DIR}/elasticsearch.pid \ - -Edefault.path.home=${ES_HOME} \ - -Edefault.path.logs=${LOG_DIR} \ - -Edefault.path.data=${DATA_DIR} \ - -Edefault.path.conf=${CONF_DIR} - -StandardOutput=journal -StandardError=inherit - -# Specifies the maximum file descriptor number that can be opened by this process -LimitNOFILE=65536 - -# Specifies the maximum number of bytes of memory that may be locked into RAM -# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option -# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch -#LimitMEMLOCK=infinity - -# Disable timeout logic and wait until process is stopped -TimeoutStopSec=0 - -# SIGTERM signal is used to stop the Java process -KillSignal=SIGTERM - -# Java process is never killed -SendSIGKILL=no - -# When a JVM receives a SIGTERM signal it exits with code 143 -SuccessExitStatus=143 - -[Install] -WantedBy=multi-user.target diff --git a/app-misc/elasticsearch/files/elasticsearch.service.2 b/app-misc/elasticsearch/files/elasticsearch.service.2 deleted file mode 100644 index 65324693e8c3..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.service.2 +++ /dev/null @@ -1,51 +0,0 @@ -[Unit] -Description=Elasticsearch -Documentation=https://www.elastic.co -Wants=network.target -After=network.target - -[Service] -Environment=ES_HOME=/usr/share/elasticsearch -Environment=ES_PATH_CONF=/etc/elasticsearch -Environment=DATA_DIR=/var/lib/elasticsearch -Environment=LOG_DIR=/var/log/elasticsearch -Environment=PID_DIR=/run/elasticsearch -EnvironmentFile=-/etc/conf.d/elasticsearch - -WorkingDirectory=/usr/share/elasticsearch - -User=elasticsearch -Group=elasticsearch - -ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec - -ExecStart=/usr/share/elasticsearch/bin/elasticsearch \ - -p ${PID_DIR}/elasticsearch.pid \ - -Epath.logs=${LOG_DIR} \ - -Epath.data=${DATA_DIR} - -StandardOutput=journal -StandardError=inherit - -# Specifies the maximum file descriptor number that can be opened by this process -LimitNOFILE=65536 - -# Specifies the maximum number of bytes of memory that may be locked into RAM -# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option -# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch -#LimitMEMLOCK=infinity - -# Disable timeout logic and wait until process is stopped -TimeoutStopSec=0 - -# SIGTERM signal is used to stop the Java process -KillSignal=SIGTERM - -# Java process is never killed -SendSIGKILL=no - -# When a JVM receives a SIGTERM signal it exits with code 143 -SuccessExitStatus=143 - -[Install] -WantedBy=multi-user.target diff --git a/app-misc/elasticsearch/files/elasticsearch.sysctl.d b/app-misc/elasticsearch/files/elasticsearch.sysctl.d deleted file mode 100644 index 62ea54d86975..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.sysctl.d +++ /dev/null @@ -1 +0,0 @@ -vm.max_map_count=262144 diff --git a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d deleted file mode 100644 index a551a1f30d4e..000000000000 --- a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d +++ /dev/null @@ -1 +0,0 @@ -d /run/elasticsearch 0755 elasticsearch elasticsearch - -- cgit v1.2.3