commit: 7073891c434fa15c7219d2212e38ee5387b971aa Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Wed Sep 19 17:30:34 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 22 07:07:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7073891c
app-misc/elasticsearch: remove unused files Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/9916 app-misc/elasticsearch/files/elasticsearch.init.3 | 62 -------------------- app-misc/elasticsearch/files/elasticsearch.init.4 | 67 ---------------------- .../elasticsearch/files/elasticsearch.service.2 | 51 ---------------- 3 files changed, 180 deletions(-) diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3 deleted file mode 100644 index cd89acd9f99..00000000000 --- 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 ac302776610..00000000000 --- 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.2 b/app-misc/elasticsearch/files/elasticsearch.service.2 deleted file mode 100644 index 65324693e8c..00000000000 --- 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
