Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/elasticsearch/files/
Date: Thu, 30 Jun 2022 12:55:38
Message-Id: 1656593727.d5653728d9be9b0ee6528907f27b07fb5e1ad2b5.flow@gentoo
1 commit: d5653728d9be9b0ee6528907f27b07fb5e1ad2b5
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Thu Jun 23 19:11:35 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 12:55:27 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5653728
7
8 app-misc/elasticsearch: remove unused files
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/26062
13 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
14
15 app-misc/elasticsearch/files/elasticsearch.conf.3 | 62 -------------------
16 app-misc/elasticsearch/files/elasticsearch.init.6 | 69 ----------------------
17 .../elasticsearch/files/elasticsearch.service.3 | 51 ----------------
18 3 files changed, 182 deletions(-)
19
20 diff --git a/app-misc/elasticsearch/files/elasticsearch.conf.3 b/app-misc/elasticsearch/files/elasticsearch.conf.3
21 deleted file mode 100644
22 index 70c052a64cce..000000000000
23 --- a/app-misc/elasticsearch/files/elasticsearch.conf.3
24 +++ /dev/null
25 @@ -1,62 +0,0 @@
26 -################################
27 -# Elasticsearch
28 -################################
29 -
30 -# Elasticsearch home directory
31 -#ES_HOME=/usr/share/elasticsearch
32 -
33 -# Elasticsearch Java path
34 -#JAVA_HOME=
35 -
36 -# Elasticsearch configuration directory
37 -#CONF_DIR=/etc/elasticsearch
38 -
39 -# Elasticsearch data directory
40 -#DATA_DIR=/var/lib/elasticsearch
41 -
42 -# Elasticsearch logs directory
43 -#LOG_DIR=/var/log/elasticsearch
44 -
45 -# Additional Java OPTS
46 -#ES_JAVA_OPTS=
47 -
48 -################################
49 -# Elasticsearch service
50 -################################
51 -
52 -# When executing the init script, this user will be used to run the elasticsearch service.
53 -# The default value is 'elasticsearch' and is declared in the init.d file.
54 -# Note that this setting is only used by the init script. If changed, make sure that
55 -# the configured user can read and write into the data, work, plugins and log directories.
56 -# For systemd service, the user is usually configured in file /usr/lib/systemd/system/elasticsearch.service
57 -#ES_USER=elasticsearch
58 -#ES_GROUP=elasticsearch
59 -
60 -# The number of seconds to wait before checking if Elasticsearch started successfully as a daemon process
61 -#ES_STARTUP_SLEEP_TIME=5
62 -
63 -################################
64 -# System properties
65 -################################
66 -
67 -# Specifies the maximum file descriptor number that can be opened by this process
68 -# When using Systemd, this setting is ignored and the LimitNOFILE defined in
69 -# /usr/lib/systemd/system/elasticsearch.service takes precedence
70 -MAX_OPEN_FILES=65536
71 -
72 -# The maximum number of bytes of memory that may be locked into RAM
73 -# Set to "unlimited" if you use the 'bootstrap.memory_lock: true' option
74 -# in elasticsearch.yml.
75 -# When using Systemd, the LimitMEMLOCK property must be set
76 -# in /usr/lib/systemd/system/elasticsearch.service
77 -MAX_LOCKED_MEMORY=unlimited
78 -
79 -# Maximum number of VMA (Virtual Memory Areas) a process can own
80 -# When using Systemd, this setting is ignored and the 'vm.max_map_count'
81 -# property is set at boot time in /usr/lib/sysctl.d/elasticsearch.conf
82 -#MAX_MAP_COUNT=262144
83 -
84 -# https://www.elastic.co/guide/en/elasticsearch/reference/master/max-number-of-threads.html
85 -MAX_THREADS=4096
86 -
87 -rc_ulimit="-l $MAX_LOCKED_MEMORY -n $MAX_OPEN_FILES -u $MAX_THREADS"
88
89 diff --git a/app-misc/elasticsearch/files/elasticsearch.init.6 b/app-misc/elasticsearch/files/elasticsearch.init.6
90 deleted file mode 100644
91 index 046941d407e5..000000000000
92 --- a/app-misc/elasticsearch/files/elasticsearch.init.6
93 +++ /dev/null
94 @@ -1,69 +0,0 @@
95 -#!/sbin/openrc-run
96 -
97 -name="Elasticsearch"
98 -description="Elasticsearch Server"
99 -
100 -ES_INSTANCE=${RC_SVCNAME#*.}
101 -
102 -if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
103 - ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
104 - CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
105 - DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
106 -else
107 - ES_BASE_PATH="/var/lib/elasticsearch/_default"
108 - CONF_DIR="/etc/elasticsearch"
109 - DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
110 -fi
111 -
112 -ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
113 -ES_USER=${ES_USER:="elasticsearch"}
114 -ES_GROUP=${ES_GROUP:="elasticsearch"}
115 -ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
116 -JAVA_HOME=${JAVA_HOME:=$(java-config -g JAVA_HOME)}
117 -MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
118 -MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
119 -
120 -DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
121 -LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
122 -
123 -if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
124 - ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
125 -fi
126 -
127 -export ES_INCLUDE
128 -export JAVA_HOME
129 -export JAVA_OPTS
130 -export ES_JVM_OPTIONS
131 -export ES_JAVA_OPTS
132 -export ES_STARTUP_SLEEP_TIME
133 -export ES_PATH_CONF="${CONF_DIR}"
134 -
135 -pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
136 -
137 -command="/usr/share/elasticsearch/bin/elasticsearch"
138 -command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
139 -command_args_background="--daemonize --pidfile=${pidfile}"
140 -command_user="${ES_USER}:${ES_GROUP}"
141 -required_files="${CONF_DIR}/elasticsearch.yml"
142 -retry="TERM/30/KILL/30"
143 -
144 -depend() {
145 - use net
146 -}
147 -
148 -start_pre() {
149 - if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
150 - sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
151 - fi
152 -
153 - checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
154 - checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
155 - checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
156 - checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
157 - checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
158 -
159 - # fails to start without keystore
160 - if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
161 - "${ES_HOME}/bin/elasticsearch-keystore" create
162 - fi
163 -}
164
165 diff --git a/app-misc/elasticsearch/files/elasticsearch.service.3 b/app-misc/elasticsearch/files/elasticsearch.service.3
166 deleted file mode 100644
167 index 69d3550e7d98..000000000000
168 --- a/app-misc/elasticsearch/files/elasticsearch.service.3
169 +++ /dev/null
170 @@ -1,51 +0,0 @@
171 -[Unit]
172 -Description=Elasticsearch
173 -Documentation=https://www.elastic.co
174 -Wants=network.target
175 -After=network.target
176 -
177 -[Service]
178 -Environment=ES_HOME=/usr/share/elasticsearch
179 -Environment=ES_PATH_CONF=/etc/elasticsearch
180 -Environment=DATA_DIR=/var/lib/elasticsearch
181 -Environment=LOG_DIR=/var/log/elasticsearch
182 -Environment=PID_DIR=/run/elasticsearch
183 -
184 -WorkingDirectory=/usr/share/elasticsearch
185 -
186 -User=elasticsearch
187 -Group=elasticsearch
188 -
189 -PermissionsStartOnly=true
190 -ExecStartPre=/usr/share/elasticsearch/bin/elasticsearch-systemd-pre-exec
191 -
192 -ExecStart=/usr/share/elasticsearch/bin/elasticsearch \
193 - -p ${PID_DIR}/elasticsearch.pid \
194 - -Epath.logs=${LOG_DIR} \
195 - -Epath.data=${DATA_DIR}
196 -
197 -StandardOutput=journal
198 -StandardError=inherit
199 -
200 -# Specifies the maximum file descriptor number that can be opened by this process
201 -LimitNOFILE=65536
202 -
203 -# Specifies the maximum number of bytes of memory that may be locked into RAM
204 -# Set to "infinity" if you use the 'bootstrap.memory_lock: true' option
205 -# in elasticsearch.yml and 'MAX_LOCKED_MEMORY=unlimited' in /etc/conf.d/elasticsearch
206 -#LimitMEMLOCK=infinity
207 -
208 -# Disable timeout logic and wait until process is stopped
209 -TimeoutStopSec=0
210 -
211 -# SIGTERM signal is used to stop the Java process
212 -KillSignal=SIGTERM
213 -
214 -# Java process is never killed
215 -SendSIGKILL=no
216 -
217 -# When a JVM receives a SIGTERM signal it exits with code 143
218 -SuccessExitStatus=143
219 -
220 -[Install]
221 -WantedBy=multi-user.target