[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/

[Ian Delaney]

commit:     7a55b27645627f3a3834bbbe2bf47732e4010b7a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Mar  8 17:33:31 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 14:23:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a55b276

app-admin/logstash-bin: did not work with multiple configuration files (thanks to Brett Merrick)

Package-Manager: portage-2.2.27

 app-admin/logstash-bin/files/logstash.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
index a613950..0a844b9 100644
--- a/app-admin/logstash-bin/files/logstash.initd
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -12,7 +12,7 @@ LS_OPEN_FILES="${LS_OPEN_FILES:-16384}"
 LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
 
 command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
+command_args="agent --config ${LS_CONFDIR}/{*}.conf --log ${LS_LOGFILE} ${LS_OPTS}"
 extra_commands="checkconfig"
 command_background="true"
 start_stop_daemon_args="--nicelevel ${LS_NICE} \

[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/

[Ian Delaney]

commit:     3b7e42f7c9c78b0e4f66a22ce4c2bfef8f904fdf
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Apr 11 10:27:06 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 06:07:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7e42f7

app-admin/logstash-bin: fix copyright year

Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1233

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 app-admin/logstash-bin/files/logstash.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
index a81e010..c2d02d7 100644
--- a/app-admin/logstash-bin/files/logstash.initd
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 LS_USER=${LS_USER:-logstash}

[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/

[Amy Liffey]

commit:     d09218230ed6bfa76224afe1f2dbff9b30adbcf6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb  2 15:40:05 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Feb  3 19:15:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0921823

app-admin/logstash-bin: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/7024

 app-admin/logstash-bin/files/logstash.logrotate | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app-admin/logstash-bin/files/logstash.logrotate b/app-admin/logstash-bin/files/logstash.logrotate
deleted file mode 100644
index 013c8ea921b..00000000000
--- a/app-admin/logstash-bin/files/logstash.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/logstash/*.log {
-        copytruncate
-        compress
-        missingok
-        notifempty
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/

[Conrad Kostecki]

commit:     1c56354ba16612312f4fd4eed424f82c04162450
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jun 19 17:10:19 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 22:48:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c56354b

app-admin/logstash-bin: remove unused files

Closes: https://github.com/gentoo/gentoo/pull/16330
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-admin/logstash-bin/files/logstash.confd-r1 | 40 --------------
 app-admin/logstash-bin/files/logstash.initd-r1 | 75 --------------------------
 2 files changed, 115 deletions(-)

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 5f59b606fed..00000000000
--- 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 2e7350d06f5..00000000000
--- 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
-}