gentoo resync : 21.06.2020

3 files changed, 0 insertions, 117 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 4fb854ccc644..ba71ed4847f3 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,8 +1,6 @@
 AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f06e744f44e3567eaa88d232f487a8c185375fc8ba4ad9cc9b15f750649286f1e1c4431d732dc5847550 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0
 AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
-AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
-AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
 AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
deleted file mode 100644
index 5f59b606fed2..000000000000
--- a/app-admin/logstash-bin/files/logstash.confd-r1
+++ /dev/null
@@ -1,40 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Set data directory
-#LS_DATA_DIR=${LS_HOME}/data
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# user id to be invoked as
-#LS_USER=logstash
-#LS_GROUP=logstash
-
-# logstash logging
-#LS_LOG_DIR=/var/log/logstash
-#LS_USE_GC_LOGGING="true"
-
-# logstash settings directory
-#LS_SETTINGS_DIR=/etc/logstash
-
-# logstash configuration directory
-#LS_CONF_DIR=/etc/logstash/conf.d
-
-# Open file limit
-#LS_OPEN_FILES=16384
-
-# Nice level
-#LS_NICE=19
-
-# If this is set to 1, then when `stop` is called, if the process has
-# not exited within a reasonable time, SIGKILL will be sent next.
-KILL_ON_STOP_TIMEOUT=0
diff --git a/app-admin/logstash-bin/files/logstash.initd-r1 b/app-admin/logstash-bin/files/logstash.initd-r1
deleted file mode 100644
index 2e7350d06f5a..000000000000
--- a/app-admin/logstash-bin/files/logstash.initd-r1
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER=${LS_USER:-logstash}
-LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
-LS_SETTINGS_DIR=${LS_SETTINGS_DIR:-/etc/logstash}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-LS_DATA_DIR=${LS_DATA_DIR:-$LS_HOME/data}
-LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
-LS_NICE=${LS_NICE:-19}
-LS_JAVA_OPTS=${LS_JAVA_OPTS:-"-Djava.io.tmpdir=${LS_HOME}"}
-LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING:-false}
-LS_OPEN_FILES=${LS_OPEN_FILES:-16384}
-KILL_ON_STOP_TIMEOUT=${KILL_ON_STOP_TIMEOUT:-0}
-
-LS_INSTALL_DIR="/opt/logstash"
-
-command="${LS_INSTALL_DIR}/bin/logstash"
-command_args="--path.config ${LS_CONF_DIR} --path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
-command_background="true"
-pidfile="/run/${RC_SVCNAME}.pid"
-
-start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
-	--chdir ${LS_HOME}
-	--nicelevel ${LS_NICE}
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}
-	--env LS_JAVA_OPTS=${LS_JAVA_OPTS}
-	--env LS_USE_GC_LOGGING=${LS_USE_GC_LOGGING}"
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-checkconfig() {
-	if [ ! -f ${LS_CONF_DIR}/* ]; then
-		eerror "Please put your configuration in ${LS_CONF_DIR}"
-		exit 1
-	fi
-
-	ebegin "Checking your configuration"
-	${command} ${command_args} --path.logs "${LS_LOG_DIR}/configcheck" --config.test_and_exit
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	rc_ulimit="-n ${LS_OPEN_FILES}"
-
-	local d
-	for d in "${LS_HOME}" "${LS_DATA_DIR}" "${LS_DATA_DIR}/queue" "${LS_DATA_DIR}/dead_letter_queue" "${LS_LOG_DIR}"; do
-		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
-	done
-}
-
-stop() {
-	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
-		start-stop-daemon --stop \
-			--pidfile=${pidfile} \
-			--retry=TERM/5/KILL/5
-	else
-		start-stop-daemon --stop \
-			--pidfile=${pidfile}
-	fi
-}