From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 810211382C5 for ; Sun, 20 Jun 2021 07:44:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9368FE077F; Sun, 20 Jun 2021 07:44:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E327E0802 for ; Sun, 20 Jun 2021 07:44:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03B9C33E01A for ; Sun, 20 Jun 2021 07:44:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57E157B3 for ; Sun, 20 Jun 2021 07:44:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1624175011.f8675058d323a4b3b7653cacddd1c33132501625.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/elasticsearch/files/elasticsearch.init.7 X-VCS-Directories: app-misc/elasticsearch/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: f8675058d323a4b3b7653cacddd1c33132501625 X-VCS-Branch: master Date: Sun, 20 Jun 2021 07:44:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7791b7c5-6972-4204-a931-05d3ecee06d8 X-Archives-Hash: 9aa566b63da3b2d1acc068b4e0cf7b57 commit: f8675058d323a4b3b7653cacddd1c33132501625 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jun 2 17:17:00 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Jun 20 07:43:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8675058 app-misc/elasticsearch: remove unused file Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/21089 Signed-off-by: Joonas Niilola gentoo.org> app-misc/elasticsearch/files/elasticsearch.init.7 | 71 ----------------------- 1 file changed, 71 deletions(-) diff --git a/app-misc/elasticsearch/files/elasticsearch.init.7 b/app-misc/elasticsearch/files/elasticsearch.init.7 deleted file mode 100644 index cac781c968d..00000000000 --- a/app-misc/elasticsearch/files/elasticsearch.init.7 +++ /dev/null @@ -1,71 +0,0 @@ -#!/sbin/openrc-run - -name="Elasticsearch" -description="Elasticsearch Server" - -ES_INSTANCE=${RC_SVCNAME#*.} - -if [ -n "${ES_INSTANCE}" ] && [ ${RC_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} -JAVA_HOME=${JAVA_HOME:=$(java-config -g JAVA_HOME)} -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="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}" -command_args_background="--daemonize --pidfile=${pidfile}" -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 - else - "${ES_HOME}/bin/elasticsearch-keystore" upgrade - fi -}