public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
Date: Thu, 30 Jun 2022 12:55:34 +0000 (UTC)	[thread overview]
Message-ID: <1656593727.d5653728d9be9b0ee6528907f27b07fb5e1ad2b5.flow@gentoo> (raw)

commit:     d5653728d9be9b0ee6528907f27b07fb5e1ad2b5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Jun 23 19:11:35 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 12:55:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5653728

app-misc/elasticsearch: remove unused files

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26062
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 app-misc/elasticsearch/files/elasticsearch.conf.3  | 62 -------------------
 app-misc/elasticsearch/files/elasticsearch.init.6  | 69 ----------------------
 .../elasticsearch/files/elasticsearch.service.3    | 51 ----------------
 3 files changed, 182 deletions(-)

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.6 b/app-misc/elasticsearch/files/elasticsearch.init.6
deleted file mode 100644
index 046941d407e5..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.init.6
+++ /dev/null
@@ -1,69 +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
-	fi
-}

diff --git a/app-misc/elasticsearch/files/elasticsearch.service.3 b/app-misc/elasticsearch/files/elasticsearch.service.3
deleted file mode 100644
index 69d3550e7d98..000000000000
--- a/app-misc/elasticsearch/files/elasticsearch.service.3
+++ /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
-
-WorkingDirectory=/usr/share/elasticsearch
-
-User=elasticsearch
-Group=elasticsearch
-
-PermissionsStartOnly=true
-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


             reply	other threads:[~2022-06-30 12:55 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-30 12:55 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-06-20  7:44 [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/ Joonas Niilola
2019-09-19  9:01 Michał Górny
2018-09-22  7:07 Michał Górny
2018-05-25 13:14 Aaron Bauman
2017-11-05 15:37 Patrice Clement
2015-12-17 13:59 Ian Delaney
2015-12-16 11:22 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1656593727.d5653728d9be9b0ee6528907f27b07fb5e1ad2b5.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox