* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2021-06-20 7:44 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-06-20 7:44 UTC (permalink / raw
To: gentoo-commits
commit: f8675058d323a4b3b7653cacddd1c33132501625
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun 2 17:17:00 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/21089
Signed-off-by: Joonas Niilola <juippis <AT> 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2022-06-30 12:55 Florian Schmaus
0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2022-06-30 12:55 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2019-09-19 9:01 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2019-09-19 9:01 UTC (permalink / raw
To: gentoo-commits
commit: e28fe87f18b44aee22a07174f63e37afdb4bcc11
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Sep 19 08:22:14 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 09:01:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e28fe87f
app-misc/elasticsearch: remove executable bit
Bug: https://bugs.gentoo.org/694620
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12967
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec b/app-misc/elasticsearch/files/elasticsearch-systemd-pre-exec
old mode 100755
new mode 100644
^ permalink raw reply [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2018-09-22 7:07 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-09-22 7:07 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2018-05-25 13:14 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2018-05-25 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 426ed349ab5ba38a3a3a2266a2d5199ad2d206a4
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu May 24 12:04:07 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 25 13:14:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=426ed349
app-misc/elasticsearch: allow to override LOG_DIR
Closes: https://bugs.gentoo.org/654630
Package-Manager: Portage-2.3.38, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/8547
app-misc/elasticsearch/files/elasticsearch.init.3 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.3 b/app-misc/elasticsearch/files/elasticsearch.init.3
index ab086197ec9..cd89acd9f99 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"
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2017-11-05 15:37 Patrice Clement
0 siblings, 0 replies; 8+ messages in thread
From: Patrice Clement @ 2017-11-05 15:37 UTC (permalink / raw
To: gentoo-commits
commit: ee9ac096c09d6dfe28f62c08ec0dc55f2756e5fb
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Oct 26 05:55:22 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 15:37:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9ac096
app-misc/elasticsearch: use /run/elasticsearch for tmpfiles.d.
Package-Manager: Portage-2.3.12, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6048
app-misc/elasticsearch/files/elasticsearch.tmpfiles.d | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
index d079f28b995..a551a1f30d4 100644
--- a/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
+++ b/app-misc/elasticsearch/files/elasticsearch.tmpfiles.d
@@ -1 +1 @@
-d /var/run/elasticsearch 0755 elasticsearch elasticsearch - -
+d /run/elasticsearch 0755 elasticsearch elasticsearch -
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2015-12-17 13:59 Ian Delaney
0 siblings, 0 replies; 8+ messages in thread
From: Ian Delaney @ 2015-12-17 13:59 UTC (permalink / raw
To: gentoo-commits
commit: 1a0ea0914d676d18ddc19c8f7b48cd6c22f68cf9
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:56:10 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:58:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0ea091
app-misc/elasticsearch: switch to correct file elasticsearch.init5
file mistakenly mixed with ".service5", now obsoleted in the gentoo bug
Gentoo bug: 564604
Package-Manager: portage-2.2.24
app-misc/elasticsearch/files/elasticsearch.init4 | 2 +-
app-misc/elasticsearch/files/elasticsearch.init5 | 94 +++++++++++++++++++++---
2 files changed, 86 insertions(+), 10 deletions(-)
diff --git a/app-misc/elasticsearch/files/elasticsearch.init4 b/app-misc/elasticsearch/files/elasticsearch.init4
index 7110e58..4ba42f6 100644
--- a/app-misc/elasticsearch/files/elasticsearch.init4
+++ b/app-misc/elasticsearch/files/elasticsearch.init4
@@ -67,7 +67,7 @@ start() {
checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
-
+
start-stop-daemon --start \
--background \
--chdir "${ES_BASE_PATH}" \
diff --git a/app-misc/elasticsearch/files/elasticsearch.init5 b/app-misc/elasticsearch/files/elasticsearch.init5
index 739c6f8..a7fb185 100644
--- a/app-misc/elasticsearch/files/elasticsearch.init5
+++ b/app-misc/elasticsearch/files/elasticsearch.init5
@@ -1,11 +1,87 @@
-[Unit]
-Description=Elasticsearch
-After=network.target
+#!/sbin/runscript
-[Service]
-User=elasticsearch
-Environment=ES_INCLUDE=/usr/share/elasticsearch/bin/elasticsearch.in.sh
-ExecStart=/usr/share/elasticsearch/bin/elasticsearch -Des.default.path.conf=/etc/elasticsearch
+name="Elasticsearch"
+description=""
-[Install]
-WantedBy=multi-user.target
+ES_USER=${ES_USER:="elasticsearch"}
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+ PIDFILE="/run/elasticsearch/elasticsearch.${ES_INSTANCE}.pid"
+ ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+ ES_CONF_PATH="/etc/elasticsearch/${ES_INSTANCE}"
+ ES_LOG_PATH="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+ PIDFILE="/run/elasticsearch/elasticsearch.pid"
+ ES_BASE_PATH="/var/lib/elasticsearch/_default"
+ ES_CONF_PATH="/etc/elasticsearch"
+ ES_LOG_PATH="/var/log/elasticsearch/_default"
+fi
+
+ES_DATA_PATH="${ES_BASE_PATH}/data"
+ES_WORK_PATH="${ES_BASE_PATH}/work"
+
+export ES_INCLUDE="/usr/share/elasticsearch/bin/elasticsearch.in.sh"
+export JAVA_OPTS
+export ES_JAVA_OPTS
+export ES_HEAP_SIZE
+export ES_HEAP_NEWSIZE
+export ES_DIRECT_SIZE
+export ES_USE_IPV4
+
+server_command="/usr/share/elasticsearch/bin/elasticsearch"
+server_args=" -p ${PIDFILE} -Des.default.path.conf=${ES_CONF_PATH} -Des.default.path.data=${ES_DATA_PATH} -Des.default.path.work=${ES_WORK_PATH} -Des.default.path.logs=${ES_LOG_PATH}"
+
+depend() {
+ use net
+}
+
+start() {
+ # elasticsearch -Des.config=/path/to/config/file
+ # elasticsearch -Des.network.host=10.0.0.4
+
+ [ ! -f "${ES_INCLUDE}" ] && {
+ eerror "${ES_INCLUDE} must be copied into place"
+ return 1
+ }
+
+ local conf
+ local conf_file
+ for conf in elasticsearch.yml logging.yml; do
+ conf_file="${ES_CONF_PATH}/${conf}"
+ if [ ! -f "${conf_file}" ]; then
+ eerror "${conf_file} must be copied into place"
+ return 1
+ fi
+ done
+
+ ebegin "Starting ${SVCNAME}"
+
+ if [ -n "${ES_MAX_FD}" ]; then
+ ulimit -n ${ES_MAX_FD}
+ einfo "Max open filedescriptors : ${ES_MAX_FD}"
+ fi
+
+ checkpath -d -o "${ES_USER}" -m750 "/var/lib/elasticsearch"
+ checkpath -d -o "${ES_USER}" -m750 "/var/log/elasticsearch"
+ checkpath -d -o "${ES_USER}" -m750 "$(dirname "${PIDFILE}")"
+ checkpath -d -o "${ES_USER}" -m750 "${ES_BASE_PATH}"
+ checkpath -d -o "${ES_USER}" -m750 "${ES_LOG_PATH}"
+
+ start-stop-daemon --start \
+ --background \
+ --chdir "${ES_BASE_PATH}" \
+ --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/KILL/5
+ eend $?
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
@ 2015-12-16 11:22 Ian Delaney
0 siblings, 0 replies; 8+ messages in thread
From: Ian Delaney @ 2015-12-16 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 5f03e659c405fcd0baa49b780a71a711376bee7f
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 11:21:43 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 11:22:20 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f03e659
app-misc/elasticsearch: add the elasticsearch.init5 script to FILESDIR
Notes from the bug;
ebuild based on the 2.0.0 ebuild by Julian Simioni
updated SRC_URI, preferring Java 8 if not installed yet
cleaned up src_prepare.
updated initscript (added here)
Gentoo bug: 564604
Package-Manager: portage-2.2.24
app-misc/elasticsearch/files/elasticsearch.init5 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/app-misc/elasticsearch/files/elasticsearch.init5 b/app-misc/elasticsearch/files/elasticsearch.init5
new file mode 100644
index 0000000..739c6f8
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init5
@@ -0,0 +1,11 @@
+[Unit]
+Description=Elasticsearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Environment=ES_INCLUDE=/usr/share/elasticsearch/bin/elasticsearch.in.sh
+ExecStart=/usr/share/elasticsearch/bin/elasticsearch -Des.default.path.conf=/etc/elasticsearch
+
+[Install]
+WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-06-30 12:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-20 7:44 [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-06-30 12:55 Florian Schmaus
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox