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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-02-09 10:26 Ian Delaney
  0 siblings, 0 replies; 13+ messages in thread
From: Ian Delaney @ 2016-02-09 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     10df308eeb6749f215bc30d94ddc9b391f978f5a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue Feb  9 08:51:31 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 08:51:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10df308e

app-admin/logstash-bin: version bump to 2.1.2/2.2.0

Package-Manager: portage-2.2.27

 app-admin/logstash-bin/Manifest                    |  6 +--
 app-admin/logstash-bin/files/agent.conf.sample     |  3 +-
 app-admin/logstash-bin/files/agent.conf.sample-r2  | 20 ----------
 .../files/{logstash.confd-r2 => logstash.confd}    |  0
 app-admin/logstash-bin/files/logstash.confd-r1     |  7 ----
 .../files/{logstash.initd-r2 => logstash.initd}    |  2 +-
 app-admin/logstash-bin/files/logstash.initd-r1     | 44 ----------------------
 ...-bin-2.1.1.ebuild => logstash-bin-2.1.2.ebuild} |  8 ++--
 ...-bin-2.1.0.ebuild => logstash-bin-2.2.0.ebuild} |  8 ++--
 9 files changed, 13 insertions(+), 85 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index a4a1c8d..3082fe0 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,3 @@
-DIST logstash-2.1.0.tar.gz 73512846 SHA256 1f132e0fc9fc46ebe836951bb44c5cd1a5f8e3f653bb44bded55300cc6c892dc SHA512 218355af77957a050bff262c1f0f9b516a9c8223a22a768d1c1a3c222c4d9e3ac67871608e6f34787a1926ac2ad2374ca0280a8a122a93b4e846c780c517984a WHIRLPOOL c22840cfadbc63490ee8e0a9ed101dcd9f3c06eca4d7b3359ae84073da6d9bb5712af1599357ff875b67eb55ad5d3e6e39634266e7e57024b4f97c23667e3b4a
-DIST logstash-2.1.1.tar.gz 73842493 SHA256 2ea975e16a02b416a5bd9eed5ab280224820f278d54f6e0ec4cccf0d8f5ca610 SHA512 5ef39ee5d6b5335bffc67450fbfd984aa513b2f4c8e7bf56cd3dacc876be7095195a40e2c7d17cc2f85c4d6b1b7ef5f0ae8953e4fc9642002d1dc17e36dcaed6 WHIRLPOOL e4737e1c1a12dea2bd11154dceb4754a5150f06a50cc9ed71c30f9749e6dea9c7484af82d341336527b3b85438f3c965c83eec8757f3fc19880fd60f5b1b1425
-DIST logstash-all-plugins-2.1.0.tar.gz 126053307 SHA256 090cca8b1d7584ed7f3a60abd4e5f4329cf36f41481de80982fee709e2febf58 SHA512 31232bdac13b8d342ac5d688c2fe0f60e6eede71e70c97d0a1e08527e1283ef348666f87d86f37e0c3208f56dc08595af18c924642fa94911f6fd19a39dab7f0 WHIRLPOOL 532676042bee4c120fdaf60c3d6cc528d6f9960d0c770bebfba773dd422663532c3f7de7b28baa085d3faaacd830a74e1f73f5020a5a9b7d48998dbdf931c117
+DIST logstash-2.1.2.tar.gz 74425223 SHA256 5d396acf901558c49b231a954741b805a57a67a45ce6b22056fa296690b2cdab SHA512 aafec2ea88849f8a844ba4276a4193a374e4f549756117535f625e4b5b384304d411382066bc39f76ebab440a7ae417d31f6d5b43c1c16c9772cac6f02f4a0db WHIRLPOOL d96b89979debc71a10b90f5ee7efedcd2e4e858750886f3fde0991ac22a5f09b869ea2c3a68bbfc1f2bd630ac748c38ade44e4d5950b923619d6e1519a683b96
+DIST logstash-2.2.0.tar.gz 74440588 SHA256 aee2437f45c726ec354f0bf9634b3638428d48bef32beb412f827eb2cc736f78 SHA512 8a167971731bf0d0a7eddb023c57c66fa8ebeb0842756711795117bdb988018040ea50848c1f6e06ba748d76b723a39f758e275778270cf92acebb3284263ce0 WHIRLPOOL b07eba50168bd9ee9e7b55e8b9fd181353188db4b4c8e4dedc289cd8c8d4fae4c10650a8d968c06cd90e132f90adbc0805c077f1d891ef968e5ae02bf240dc27
+DIST logstash-all-plugins-2.2.0.tar.gz 129473672 SHA256 966b5408e66af003f96084bf6f8764855c00530db8b326513d795541a62e4d41 SHA512 0725275e312f9a936d750959ccc388bac0df91ff7dd1a74d501cfdfe20006a0a5008d0877012ad80b5caece3f64bdc86b79ffb20e2f07c4a8cd5bdd2daf8d1b2 WHIRLPOOL 3cfaf4693a0b7ef0343a973de344b063ad0d1928bf9316cc893ed88de9a7ef209a206d0cb881582c2213de9409874a959c44d874af82a5bad6468943fe4297c8

diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index 9d125cd..96781bd 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -15,7 +15,6 @@ output {
     }
   
     elasticsearch {
-        host => localhost
-        cluster => elasticsearch
+        hosts => localhost
     }
 }

diff --git a/app-admin/logstash-bin/files/agent.conf.sample-r2 b/app-admin/logstash-bin/files/agent.conf.sample-r2
deleted file mode 100644
index 96781bd..0000000
--- a/app-admin/logstash-bin/files/agent.conf.sample-r2
+++ /dev/null
@@ -1,20 +0,0 @@
-input {
-    stdin {
-        type => "stdin"
-    }
-
-    file {
-        type => "syslog"
-        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
-    }
-}
-
-output {
-    stdout {
-        codec => rubydebug
-    }
-  
-    elasticsearch {
-        hosts => localhost
-    }
-}

diff --git a/app-admin/logstash-bin/files/logstash.confd-r2 b/app-admin/logstash-bin/files/logstash.confd
similarity index 100%
rename from app-admin/logstash-bin/files/logstash.confd-r2
rename to app-admin/logstash-bin/files/logstash.confd

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 b101e86..0000000
--- a/app-admin/logstash-bin/files/logstash.confd-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#LS_USER="root"
-#LS_GROUP="root"
-#LS_CONFDIR="/etc/logstash/conf.d"
-#LS_LOGFILE="/var/log/logstash/logstash.log"
-#LS_PIDFILE="/run/logstash/logstash.pid"
-#LS_HEAP_SIZE="500m"
-#LS_OPTS=""

diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd
similarity index 97%
rename from app-admin/logstash-bin/files/logstash.initd-r2
rename to app-admin/logstash-bin/files/logstash.initd
index e4abf59..a613950 100644
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ 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:-root}"

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 c65f098..0000000
--- a/app-admin/logstash-bin/files/logstash.initd-r1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LS_USER="${LS_USER:-root}"
-LS_GROUP="${LS_GROUP:-root}"
-LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
-LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
-LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
-LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
-extra_commands="checkconfig"
-command_background="true"
-start_stop_daemon_args="--user=${LS_USER}:${LS_GROUP} \
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
-pidfile="${LS_PIDFILE}"
-
-depend() {
-	use net
-	after elasticsearch
-}
-
-checkconfig() {
-	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
-}
-
-stop() {
-	ebegin "Stopping logstash"
-	start-stop-daemon --stop \
-		--pidfile="${LS_PIDFILE}" \
-		--retry=TERM/5/KILL/5
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.2.ebuild
similarity index 85%
rename from app-admin/logstash-bin/logstash-bin-2.1.1.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.1.2.ebuild
index f7b2060..7348984 100644
--- a/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,7 +28,7 @@ src_install() {
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/etc/${MY_PN}/conf.d"
-	newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
+	newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
@@ -37,8 +37,8 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
 
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
 }
 
 pkg_postinst() {

diff --git a/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.0.ebuild
similarity index 87%
rename from app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.2.0.ebuild
index f165b2a..479b7a4 100644
--- a/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ src_install() {
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/etc/${MY_PN}/conf.d"
-	newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
+	newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
@@ -45,8 +45,8 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
 
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-04-05  9:50 Patrick Lauer
  0 siblings, 0 replies; 13+ messages in thread
From: Patrick Lauer @ 2016-04-05  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1c0fb631665d334631e39300089dda2e42069980
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 09:48:15 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 09:48:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0fb631

app-admin/logstash-bin: Add reload to init script #579032

Package-Manager: portage-2.2.28

 app-admin/logstash-bin/files/logstash.initd-r2     | 65 ++++++++++++++++++++++
 .../logstash-bin/logstash-bin-2.3.0-r1.ebuild      |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
new file mode 100644
index 0000000..81d5ceb
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -0,0 +1,65 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 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_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+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}
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+command_background="true"
+pidfile=${LS_PIDFILE:-"/run/logstash/logstash.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() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	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}"
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+}
+
+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
+}

diff --git a/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
index 7fcd1d8..e7cee56 100644
--- a/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
@@ -46,7 +46,7 @@ src_install() {
 	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-04-05  9:50 Patrick Lauer
  0 siblings, 0 replies; 13+ messages in thread
From: Patrick Lauer @ 2016-04-05  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     b32a2573e265e07a5c6b9bf0a67dec580b9cc732
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 09:46:03 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 09:46:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32a2573

app-admin/logstash-bin: Fix logrotate #579066

Package-Manager: portage-2.2.28

 .../logstash-bin/files/{logstash.logrotate-r1 => logstash.logrotate-r2} | 2 +-
 .../{logstash-bin-2.2.2-r1.ebuild => logstash-bin-2.2.2-r2.ebuild}      | 2 +-
 .../{logstash-bin-2.3.0.ebuild => logstash-bin-2.3.0-r1.ebuild}         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/logstash-bin/files/logstash.logrotate-r1 b/app-admin/logstash-bin/files/logstash.logrotate-r2
similarity index 60%
rename from app-admin/logstash-bin/files/logstash.logrotate-r1
rename to app-admin/logstash-bin/files/logstash.logrotate-r2
index 5de699a..0a9c28c 100644
--- a/app-admin/logstash-bin/files/logstash.logrotate-r1
+++ b/app-admin/logstash-bin/files/logstash.logrotate-r2
@@ -1,4 +1,4 @@
-/var/log/logstash/*.{err,log} {
+/var/log/logstash/*.err /var/log/logstash/*.log {
         copytruncate
         compress
         missingok

diff --git a/app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
index 8d3ffea..7fcd1d8 100644
--- a/app-admin/logstash-bin/logstash-bin-2.2.2-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
@@ -43,7 +43,7 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r1" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
 	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"

diff --git a/app-admin/logstash-bin/logstash-bin-2.3.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-2.3.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
index 8d3ffea..7fcd1d8 100644
--- a/app-admin/logstash-bin/logstash-bin-2.3.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
@@ -43,7 +43,7 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r1" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
 	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-04-12  6:07 Ian Delaney
  0 siblings, 0 replies; 13+ messages in thread
From: Ian Delaney @ 2016-04-12  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     5a4564496604d80cdffd7eccdb00e80ded5fe840
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Mon Apr 11 10:24:55 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=5a456449

app-admin/logstash-bin: bump to 2.2.4/2.3.1, remove old

Fixes bugs #578954 and #578978

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/Manifest                    |  8 +--
 app-admin/logstash-bin/files/logstash.confd        | 42 ++++++++++--
 app-admin/logstash-bin/files/logstash.confd-r1     | 37 -----------
 app-admin/logstash-bin/files/logstash.initd        | 75 ++++++++++++++--------
 app-admin/logstash-bin/files/logstash.initd-r1     | 57 ----------------
 app-admin/logstash-bin/files/logstash.initd-r2     | 65 -------------------
 app-admin/logstash-bin/files/logstash.logrotate-r2 |  6 --
 app-admin/logstash-bin/logstash-bin-2.1.3.ebuild   | 52 ---------------
 app-admin/logstash-bin/logstash-bin-2.2.2.ebuild   | 52 ---------------
 ...n-2.2.2-r2.ebuild => logstash-bin-2.2.4.ebuild} | 14 ++--
 .../logstash-bin/logstash-bin-2.3.0-r1.ebuild      | 60 -----------------
 ...-bin-2.2.0.ebuild => logstash-bin-2.3.1.ebuild} | 19 ++++--
 12 files changed, 109 insertions(+), 378 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 4a66b10..2c467a3 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,5 +1,3 @@
-DIST logstash-2.1.3.tar.gz 74433726 SHA256 c592ea6c63a64f44a08a4b86b8ce6e72847ffdf0cd207d1571dcfda899f7134f SHA512 76a25c4ac49b2d8d10ea13e60a249dad95b661f54310ad5ba7abf169065429342323e97d0bd1954542db31627d27762aabd0087186e3176a27066afc9b1e185c WHIRLPOOL 7da3f23e3fa0c09c7de0098dc09c5019e7bd5e7b3bf67b6df7b9d5d5ee06e6f2cb88c49b3865931cbe58342b28dd6035ea7da6889ff55d00ab6b87612a7ceff2
-DIST logstash-2.2.0.tar.gz 74440588 SHA256 aee2437f45c726ec354f0bf9634b3638428d48bef32beb412f827eb2cc736f78 SHA512 8a167971731bf0d0a7eddb023c57c66fa8ebeb0842756711795117bdb988018040ea50848c1f6e06ba748d76b723a39f758e275778270cf92acebb3284263ce0 WHIRLPOOL b07eba50168bd9ee9e7b55e8b9fd181353188db4b4c8e4dedc289cd8c8d4fae4c10650a8d968c06cd90e132f90adbc0805c077f1d891ef968e5ae02bf240dc27
-DIST logstash-2.2.2.tar.gz 74452781 SHA256 f0a29ec8fd327e42f3023bd6bf85a00ac20617bfc214df59c765453977398312 SHA512 bab0463f6d4aeccfac04007d318b8cf70d56c803dfaa7948fb7dc1ca29bb91ccc3b1c5b705bede585e4adb98e63b3515bbabfc1206378e3b53ead78cf08c3da4 WHIRLPOOL 92122b7687b7230ad9d9415d9bbcca737cabb46f512d2a86f4401205a3cdf0f31bee8bf6e0a42066a54234474b490c008ad2084f8ff5a5fc5af87532842de39a
-DIST logstash-2.3.0.tar.gz 73593126 SHA256 d802803ac6dc7e9215b19764dd8fbaa74c75fa1d8bf387508fb0d0d8d36b0241 SHA512 1a8aa6ebe43b80c6cfe44e5ac8233b451c0cbd1bf4636155726b115992a0a2b046926a5fa887d2dc33f7611e9a295cdd4a5875c875f289400ea7f93413459928 WHIRLPOOL 1d3e54ae4775459f35bf1d0fe51e634c27b5b0488e9e6fe9129d38956bd5296b3b78bea77c8a72b810fb11ea9a13214efad900398cd9c76d1e95d6ced79cd043
-DIST logstash-all-plugins-2.2.0.tar.gz 129473672 SHA256 966b5408e66af003f96084bf6f8764855c00530db8b326513d795541a62e4d41 SHA512 0725275e312f9a936d750959ccc388bac0df91ff7dd1a74d501cfdfe20006a0a5008d0877012ad80b5caece3f64bdc86b79ffb20e2f07c4a8cd5bdd2daf8d1b2 WHIRLPOOL 3cfaf4693a0b7ef0343a973de344b063ad0d1928bf9316cc893ed88de9a7ef209a206d0cb881582c2213de9409874a959c44d874af82a5bad6468943fe4297c8
+DIST logstash-2.2.4.tar.gz 75221745 SHA256 0d7fa078eb93b1eecea2845b1404b0f05b438cb3ecc9999316477980ef945492 SHA512 fe8aaea2d2d44f3c1b178a72cf760a7bb345110e51905ea2cfe0a493051c53218f473db7bbf6dbb88c36b92c4aaa28e8edf05c91711207249b4a0f01b6b60055 WHIRLPOOL 8c37e72a581a1594706eb14c30c56fc9b6d8e78ca7e8fee63885983c10560cb6250e5a82b8e233d3abb3d234575252d2676cf5429e6589fa1981aefb50c7cfdd
+DIST logstash-2.3.1.tar.gz 75222794 SHA256 d4bab55c6d59846995fa88ba297387cfa31d7e7e8b21a35441178b7a44cfff45 SHA512 54b03fedd77b62f2e71b39059435fe38c16780b629b35fe25a7e2ef8c51864c6b19978481c740be181cbc83af78b23aea087e06068af2b5f436b0ad28985bce4 WHIRLPOOL e2351ab481a83ab894248715337785562dc392eae22ffe6073d2218dc33c4b62f4499e7b31a4d4301eb85dbe23ac7fd3596a2752d050b348ad46ad17ec62c544
+DIST logstash-all-plugins-2.3.1.tar.gz 130666101 SHA256 ecdede3d5bd14f8a146abcdc3860467382467a31581bdcc3cd8e417b306822fe SHA512 0848b5dc04116185c9a0069347279035f12b2d79ea4e45a4f91fdbe68d06559e1eea68579e8e0266bcf4f015a91c51571ffb2e52538cd704666cf7e1653800c7 WHIRLPOOL 0cc0297e2c7b0c595862dd0f11bf0d74fb0da6cecdbc79ec8580c2fda63a0441133736bef48657baa2e620d045c6b6b48dbb8a78c58ffdf7ff96a387acaca5e8

diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
index cb68395..6d197a2 100644
--- a/app-admin/logstash-bin/files/logstash.confd
+++ b/app-admin/logstash-bin/files/logstash.confd
@@ -1,9 +1,37 @@
-#LS_USER="root"
-#LS_GROUP="root"
-#LS_CONFDIR="/etc/logstash/conf.d"
-#LS_LOGFILE="/var/log/logstash/logstash.log"
-#LS_PIDFILE="/run/logstash/logstash.pid"
+###############################
+# Default settings for logstash
+###############################
+
+# Set a home directory
+#LS_HOME=/var/lib/logstash
+
+# Arguments to pass to logstash agent
+#LS_OPTS=""
+
+# Arguments to pass to java
 #LS_HEAP_SIZE="500m"
-#LS_NICE=19
+#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
+
+# pidfiles location
+#LS_PIDFILE=/run/logstash/logstash.pid
+
+# user id to be invoked as
+#LS_USER=logstash
+#LS_GROUP=logstash
+
+# logstash logging
+#LS_LOG_FILE=/var/log/logstash/logstash.log
+#LS_USE_GC_LOGGING="true"
+
+# logstash configuration directory
+#LS_CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
 #LS_OPEN_FILES=16384
-#LS_OPTS=""
+
+# 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.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
deleted file mode 100644
index 6d197a2..0000000
--- a/app-admin/logstash-bin/files/logstash.confd-r1
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# pidfiles location
-#LS_PIDFILE=/run/logstash/logstash.pid
-
-# user id to be invoked as
-#LS_USER=logstash
-#LS_GROUP=logstash
-
-# logstash logging
-#LS_LOG_FILE=/var/log/logstash/logstash.log
-#LS_USE_GC_LOGGING="true"
-
-# 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 b/app-admin/logstash-bin/files/logstash.initd
index 0a844b9..a81e010 100644
--- a/app-admin/logstash-bin/files/logstash.initd
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -1,49 +1,70 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-LS_USER="${LS_USER:-root}"
-LS_GROUP="${LS_GROUP:-root}"
-LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
-LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
-LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
-LS_NICE="${LS_NICE:-19}"
-LS_OPEN_FILES="${LS_OPEN_FILES:-16384}"
-LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
+LS_USER=${LS_USER:-logstash}
+LS_GROUP=${LS_GROUP:-$LS_USER}
+LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+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}
 
 command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONFDIR}/{*}.conf --log ${LS_LOGFILE} ${LS_OPTS}"
-extra_commands="checkconfig"
+command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
 command_background="true"
-start_stop_daemon_args="--nicelevel ${LS_NICE} \
-	--user ${LS_USER}:${LS_GROUP} \
-	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
-pidfile="${LS_PIDFILE}"
-
-depend() {
-	use net
-	after elasticsearch
-}
+pidfile=${LS_PIDFILE:-"/run/logstash/logstash.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} --configtest
 	eend $? "Configuration error. Please fix your configuration files."
 }
 
-start_pre() {
+reload() {
 	checkconfig || return 1
+	ebegin "Reloading configuration"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
 
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
+start_pre() {
+	checkconfig || return 1
 
 	rc_ulimit="-n ${LS_OPEN_FILES}"
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
 }
 
 stop() {
 	ebegin "Stopping logstash"
-	start-stop-daemon --stop \
-		--pidfile="${LS_PIDFILE}" \
-		--retry=TERM/5/KILL/5
+	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
 }

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 91f6297..0000000
--- a/app-admin/logstash-bin/files/logstash.initd-r1
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 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_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-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}
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
-command_background="true"
-pidfile=${LS_PIDFILE:-"/run/logstash/logstash.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"
-
-checkconfig() {
-	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	rc_ulimit="-n ${LS_OPEN_FILES}"
-
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
-}
-
-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
-}

diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
deleted file mode 100644
index 81d5ceb..0000000
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 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_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
-LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-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}
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
-command_background="true"
-pidfile=${LS_PIDFILE:-"/run/logstash/logstash.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() {
-	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
-	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}"
-
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
-}
-
-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
-}

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

diff --git a/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild
deleted file mode 100644
index 7348984..0000000
--- a/app-admin/logstash-bin/logstash-bin-2.1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild
deleted file mode 100644
index 7348984..0000000
--- a/app-admin/logstash-bin/logstash-bin-2.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild b/app-admin/logstash-bin/logstash-bin-2.2.4.ebuild
similarity index 74%
rename from app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.2.4.ebuild
index 7fcd1d8..437c3b8 100644
--- a/app-admin/logstash-bin/logstash-bin-2.2.2-r2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,7 +35,7 @@ src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"
 
-	insinto "/etc/${MY_PN}/conf.d"
+	insinto "/usr/share/${MY_PN}"
 	doins "${FILESDIR}/agent.conf.sample"
 
 	insinto "/opt/${MY_PN}"
@@ -43,13 +43,17 @@ src_install() {
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
+	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
-	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
 }
 
 pkg_postinst() {
+	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
+	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
+	ewarn "/etc/conf.d/${MY_PN}"
+	einfo
 	einfo "Getting started with logstash:"
 	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
 	einfo ""

diff --git a/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
deleted file mode 100644
index e7cee56..0000000
--- a/app-admin/logstash-bin/logstash-bin-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit user
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate-r2" "${MY_PN}"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.3.1.ebuild
similarity index 72%
rename from app-admin/logstash-bin/logstash-bin-2.2.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-2.3.1.ebuild
index 479b7a4..0735e0c 100644
--- a/app-admin/logstash-bin/logstash-bin-2.2.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-2.3.1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+inherit user
+
 MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
 
@@ -29,27 +31,34 @@ pkg_setup() {
 	if use standard && use all-plugins; then
 		die "Both standard and all-plugins USE selected, please pick just one."
 	fi
+
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN} -m
 }
 
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"
 
-	insinto "/etc/${MY_PN}/conf.d"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf.sample
+	insinto "/usr/share/${MY_PN}"
+	doins "${FILESDIR}/agent.conf.sample"
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
-	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
-	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
 }
 
 pkg_postinst() {
+	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
+	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
+	ewarn "/etc/conf.d/${MY_PN}"
+	einfo
 	einfo "Getting started with logstash:"
 	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
 	einfo ""


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-10-28 19:25 Patrick Lauer
  0 siblings, 0 replies; 13+ messages in thread
From: Patrick Lauer @ 2016-10-28 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     dedc7ecc4bee7e1b514ad17d3d545801f8914650
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 19:17:32 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 19:25:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedc7ecc

app-admin/logstash-bin: Bump to 5.0.0

Package-Manager: portage-2.3.2

 app-admin/logstash-bin/Manifest                    |  2 +-
 app-admin/logstash-bin/files/logstash.initd2       | 70 ++++++++++++++++++++++
 ...-5.0.0_rc1.ebuild => logstash-bin-5.0.0.ebuild} |  7 +--
 3 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 3ff55b8..5aaf1cd 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,4 @@
 DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b18284f43ed9c0089a2efee78b239583 SHA512 cc5d6c04e414daf63c836141df87204e0cbc63f71ee02abb69496e29587d5b0803dd738949de559a597979c9f6c6bf9d11d55f4b084ce875f24fb362f2c9bd3b WHIRLPOOL 71b6d915153d80d9bc81d10454ffd14af4643c61557964d7fd8edf50bf1a5d1c53ce0b09c2aec9b079918df596bbb5b07420b8661572bf7ea659e9703694f07c
 DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
-DIST logstash-5.0.0-rc1.zip 110823656 SHA256 79d75d5c48b8094951066af4d92ad10e3f77e678d644b2af045bf4367ac8afc9 SHA512 2a8714de7642b89d2f5ec659b194f0949ca65123546389cd1ebdc8c211d24b985d255d61c5f9c84edd231adb61b15f183a9d409574bc9e7f7610444d674d339b WHIRLPOOL 2db57dccb27a0bb91381690da8b79b56868bd5d0deae39c7fbb9749b17f61283c36e49a1d487ed0301ecd347e49ea0b78d52c4e475ac035ed3f25c56372abc19
+DIST logstash-5.0.0.zip 110726123 SHA256 9a8ba13f9d4333fb17f373fc822a0ae5458ef8a37c026b823fc9a66044f8e331 SHA512 928541781d5f6bf16d91184f4863c2ecc3b8f07c190fd332b79f4f790091faf0531063459b96a53a250d986060a8968d9d326285e3195a39a116f0dc2ac1e43d WHIRLPOOL a6447c19d717819fa95b4e35e149215f8e6b270032311a80d56b235a1ee3de3561bd3ce5277ee3bd1fc11126819a0333d9ed068306f360e93788742ba45246d0
 DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4

diff --git a/app-admin/logstash-bin/files/logstash.initd2 b/app-admin/logstash-bin/files/logstash.initd2
new file mode 100644
index 00000000..bd0cc91
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd2
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 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_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
+LS_HOME=${LS_HOME:-/var/lib/logstash}
+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}
+
+command="/opt/logstash/bin/logstash"
+command_args="--config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+command_background="true"
+pidfile=${LS_PIDFILE:-"/run/logstash/logstash.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} --configtest
+	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}"
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+}
+
+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
+}

diff --git a/app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild b/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild
similarity index 93%
rename from app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.0.0.ebuild
index f6418dd..be89a3b 100644
--- a/app-admin/logstash-bin/logstash-bin-5.0.0_rc1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.0.0.ebuild
@@ -7,8 +7,7 @@ EAPI=6
 inherit user
 
 MY_PN="${PN/-bin}"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
@@ -16,7 +15,7 @@ SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE=""
 
 RESTRICT="strip"
@@ -47,7 +46,7 @@ src_install() {
 	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
 	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd2" "${MY_PN}"
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-12-23  8:20 Göktürk Yüksek
  0 siblings, 0 replies; 13+ messages in thread
From: Göktürk Yüksek @ 2016-12-23  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b7d73b169c279753387d878bb814b1661ff8e33d
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Dec 22 23:04:19 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 08:20:01 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7d73b16

app-admin/logstash-bin: version bump to 5.1.1

 app-admin/logstash-bin/Manifest                  |  1 +
 app-admin/logstash-bin/files/agent.conf.sample2  | 19 +++++++
 app-admin/logstash-bin/logstash-bin-5.1.1.ebuild | 64 ++++++++++++++++++++++++
 3 files changed, 84 insertions(+)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 73054ec..83698c2 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -2,4 +2,5 @@ DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b1828
 DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
 DIST logstash-5.0.0.zip 110726123 SHA256 9a8ba13f9d4333fb17f373fc822a0ae5458ef8a37c026b823fc9a66044f8e331 SHA512 928541781d5f6bf16d91184f4863c2ecc3b8f07c190fd332b79f4f790091faf0531063459b96a53a250d986060a8968d9d326285e3195a39a116f0dc2ac1e43d WHIRLPOOL a6447c19d717819fa95b4e35e149215f8e6b270032311a80d56b235a1ee3de3561bd3ce5277ee3bd1fc11126819a0333d9ed068306f360e93788742ba45246d0
 DIST logstash-5.0.1.zip 110853954 SHA256 e2da648882f1583190e9146b0a994d7956c6e6ec0d17d4c92187b8fc74a1e9ee SHA512 57ceb47fb971d8bebf4d952d01f40dc14c79e9774ee228e2f3f55e8e1cf882df1361902192af93e0a5a74a18fb10ad2387b0922665e9285ff4d3b11add71b2e2 WHIRLPOOL 9867f9f1a2d06e5cccb81fe3db8ee0f8104085103f900442fd041770a3ec8c3941b7639c58766576e8a2d0c99dc5736ce62e7c002d3b6420f0de1205e9c5c09c
+DIST logstash-5.1.1.zip 100043857 SHA256 f120a8876dbb8a17717dcb7225f70baefb23e69b7c0d0217c58ed4942b22eef6 SHA512 ce7d8d5fb3217fbba8cd6602d5685d0f050d5fdab7c6311e1f2511ff24e998f0c281f07c222d8e9be3be4893cc8f4e487f8a6c59831a1b0af3fbbbcc8f97d0f3 WHIRLPOOL c461af064a939bbbd363b9ad601344b16d447b09b849b8b7dadd113440f718b17e49d8bf1112200f77e1a3f89b9547cc89422dded68aea608a73c4f4a7cd12bb
 DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4

diff --git a/app-admin/logstash-bin/files/agent.conf.sample2 b/app-admin/logstash-bin/files/agent.conf.sample2
new file mode 100644
index 00000000..adf29e1
--- /dev/null
+++ b/app-admin/logstash-bin/files/agent.conf.sample2
@@ -0,0 +1,19 @@
+input {
+    stdin {
+        type => "stdin"
+    }
+
+    file {
+        type => "syslog"
+        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+    }
+}
+
+output {
+    stdout {
+        codec => rubydebug
+    }
+
+    elasticsearch {
+    }
+}

diff --git a/app-admin/logstash-bin/logstash-bin-5.1.1.ebuild b/app-admin/logstash-bin/logstash-bin-5.1.1.ebuild
new file mode 100644
index 00000000..d9a0c67
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample2" agent.conf
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
+}
+
+pkg_postinst() {
+	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
+	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
+	ewarn "${EROOT%/}/etc/conf.d/${MY_PN}"
+	einfo
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2016-12-29 12:18 Michael Palimaka
  0 siblings, 0 replies; 13+ messages in thread
From: Michael Palimaka @ 2016-12-29 12:18 UTC (permalink / raw
  To: gentoo-commits

commit:     fd9029d6a236faa1cca2f96f5578320a63d89360
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Dec 29 08:36:05 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 12:18:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9029d6

app-admin/logstash-bin: fix permissions via initscript

 app-admin/logstash-bin/files/logstash.initd4                   | 10 ++++++----
 ...{logstash-bin-5.1.1.ebuild => logstash-bin-5.1.1-r1.ebuild} |  0
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-admin/logstash-bin/files/logstash.initd4 b/app-admin/logstash-bin/files/logstash.initd4
index b9e9055..00b732e 100644
--- a/app-admin/logstash-bin/files/logstash.initd4
+++ b/app-admin/logstash-bin/files/logstash.initd4
@@ -54,10 +54,12 @@ start_pre() {
 
 	rc_ulimit="-n ${LS_OPEN_FILES}"
 
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "${LS_INSTALL_DIR}/data"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "${LS_LOG_DIR}"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_DIR}/logstash-plain.log"
+	local d
+	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
+	done
+
 }
 
 stop() {

diff --git a/app-admin/logstash-bin/logstash-bin-5.1.1.ebuild b/app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-5.1.1.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2017-01-17 22:54 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2017-01-17 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7d73142bca06d96757fe9a69b963212c1d936657
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Sun Jan 15 06:26:14 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 22:54:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d73142b

app-admin/logstash-bin: version bump to 5.1.2.

Gentoo-Bug: https://bugs.gentoo.org/605810

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

 app-admin/logstash-bin/Manifest                                       | 2 +-
 app-admin/logstash-bin/files/logstash.initd                           | 2 +-
 app-admin/logstash-bin/files/logstash.initd3                          | 2 +-
 app-admin/logstash-bin/files/logstash.initd4                          | 2 +-
 .../{logstash-bin-5.1.1-r1.ebuild => logstash-bin-5.1.2.ebuild}       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 83698c2..1898b0c 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -2,5 +2,5 @@ DIST logstash-2.3.4.tar.gz 79779303 SHA256 7f62a03ddc3972e33c343e982ada1796b1828
 DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
 DIST logstash-5.0.0.zip 110726123 SHA256 9a8ba13f9d4333fb17f373fc822a0ae5458ef8a37c026b823fc9a66044f8e331 SHA512 928541781d5f6bf16d91184f4863c2ecc3b8f07c190fd332b79f4f790091faf0531063459b96a53a250d986060a8968d9d326285e3195a39a116f0dc2ac1e43d WHIRLPOOL a6447c19d717819fa95b4e35e149215f8e6b270032311a80d56b235a1ee3de3561bd3ce5277ee3bd1fc11126819a0333d9ed068306f360e93788742ba45246d0
 DIST logstash-5.0.1.zip 110853954 SHA256 e2da648882f1583190e9146b0a994d7956c6e6ec0d17d4c92187b8fc74a1e9ee SHA512 57ceb47fb971d8bebf4d952d01f40dc14c79e9774ee228e2f3f55e8e1cf882df1361902192af93e0a5a74a18fb10ad2387b0922665e9285ff4d3b11add71b2e2 WHIRLPOOL 9867f9f1a2d06e5cccb81fe3db8ee0f8104085103f900442fd041770a3ec8c3941b7639c58766576e8a2d0c99dc5736ce62e7c002d3b6420f0de1205e9c5c09c
-DIST logstash-5.1.1.zip 100043857 SHA256 f120a8876dbb8a17717dcb7225f70baefb23e69b7c0d0217c58ed4942b22eef6 SHA512 ce7d8d5fb3217fbba8cd6602d5685d0f050d5fdab7c6311e1f2511ff24e998f0c281f07c222d8e9be3be4893cc8f4e487f8a6c59831a1b0af3fbbbcc8f97d0f3 WHIRLPOOL c461af064a939bbbd363b9ad601344b16d447b09b849b8b7dadd113440f718b17e49d8bf1112200f77e1a3f89b9547cc89422dded68aea608a73c4f4a7cd12bb
+DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
 DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4

diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
index c2d02d7..eee6c09 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-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 LS_USER=${LS_USER:-logstash}

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

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

diff --git a/app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
similarity index 96%
rename from app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
index d9a0c67..0dc59f4 100644
--- a/app-admin/logstash-bin/logstash-bin-5.1.1-r1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI=6
 
 inherit user
 
-MY_PN="${PN/-bin}"
+MY_PN="${PN%-bin}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Tool for managing events and logs"


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2017-02-13 15:01 Andrew Savchenko
  0 siblings, 0 replies; 13+ messages in thread
From: Andrew Savchenko @ 2017-02-13 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bbdc5412061adf598ed935697441a7d6b05f7614
Author:     Tomas Mozes <tmozes <AT> sygic <DOT> com>
AuthorDate: Mon Feb 13 13:02:21 2017 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 14:58:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdc5412

app-admin/logstash-bin: drop old

Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 app-admin/logstash-bin/Manifest                    |  2 -
 app-admin/logstash-bin/files/agent.conf.sample     |  3 +-
 app-admin/logstash-bin/files/agent.conf.sample2    | 19 ------
 app-admin/logstash-bin/files/logstash.confd        |  2 +-
 app-admin/logstash-bin/files/logstash.confd2       | 37 -----------
 app-admin/logstash-bin/files/logstash.initd        | 21 +++---
 app-admin/logstash-bin/files/logstash.initd4       | 75 ----------------------
 .../logstash-bin/logstash-bin-2.4.0-r3.ebuild      | 65 -------------------
 app-admin/logstash-bin/logstash-bin-5.1.2.ebuild   |  8 +--
 app-admin/logstash-bin/logstash-bin-5.2.0.ebuild   |  6 +-
 app-admin/logstash-bin/metadata.xml                |  3 -
 11 files changed, 21 insertions(+), 220 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index bed8131cc8..c2746956d6 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,2 @@
-DIST logstash-2.4.0.tar.gz 83882952 SHA256 622c435c5c0f40e205fd4d9411eb409cc52992cf62dde4c7cd46e480cd8247cc SHA512 27f7e22fcfbeabe58bef1220399a80b32b56b5e2af17c0279e3f583ed5170be649b961b92c3eef33120ce238f126a3cb32e614bd8109bd8c266b538888c5324d WHIRLPOOL 2d1db78ff21d86e22f709600b086dfc253120e6a659d46c1e6ebc6d62dfffd48f0a440c33fa9a1cd7014108f5ae88afa4ccd25211ce57b1a4856f756a855c71e
 DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
 DIST logstash-5.2.0.zip 100036780 SHA256 875b5dab32a801ad489088fd4da5c2c18bf6292f58e7d17499b83fb9041a6d57 SHA512 30094d4f3f33394b4b6c1083058ab7fe2c33a4fb399f5866d01a472aa851984ec338eca67fbaf004abbd627a9286d8e4d129cdc1dcab627111b0a4d0a78295a7 WHIRLPOOL cee54f5b9c76209be142931755be69f620043beef75d8f6d8a289e2ae5d9c6b7fd5578967eade987fc43f7a219464551f556ca077e2f9d03b9e2960a4ec3d7fe
-DIST logstash-all-plugins-2.4.0.tar.gz 139743651 SHA256 b2ffe60745ece2140ebc4610f42543dcf3ff5ead2707f0b36f0b70e8ddf0baff SHA512 9627f6119d129b4dcdc41ff43e49a3880f4ba5fcb3ee11e1ec821929d542c93629b0f58ded6741c96da49cba16b05eca141acdeee0ed060389abc3f467bba593 WHIRLPOOL 49ddc27d6030ae65aaab0acabda478644232f92cbd2bbe3d1b118782c5ce1167edb2a485def982f3b6c8138f084e79a783273dd50519a82085b984259f7e19d4

diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index 96781bd332..adf29e1e13 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -13,8 +13,7 @@ output {
     stdout {
         codec => rubydebug
     }
-  
+
     elasticsearch {
-        hosts => localhost
     }
 }

diff --git a/app-admin/logstash-bin/files/agent.conf.sample2 b/app-admin/logstash-bin/files/agent.conf.sample2
deleted file mode 100644
index adf29e1e13..0000000000
--- a/app-admin/logstash-bin/files/agent.conf.sample2
+++ /dev/null
@@ -1,19 +0,0 @@
-input {
-    stdin {
-        type => "stdin"
-    }
-
-    file {
-        type => "syslog"
-        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
-    }
-}
-
-output {
-    stdout {
-        codec => rubydebug
-    }
-
-    elasticsearch {
-    }
-}

diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
index 6d197a2196..dd861d0633 100644
--- a/app-admin/logstash-bin/files/logstash.confd
+++ b/app-admin/logstash-bin/files/logstash.confd
@@ -20,7 +20,7 @@
 #LS_GROUP=logstash
 
 # logstash logging
-#LS_LOG_FILE=/var/log/logstash/logstash.log
+#LS_LOG_DIR=/var/log/logstash
 #LS_USE_GC_LOGGING="true"
 
 # logstash configuration directory

diff --git a/app-admin/logstash-bin/files/logstash.confd2 b/app-admin/logstash-bin/files/logstash.confd2
deleted file mode 100644
index dd861d0633..0000000000
--- a/app-admin/logstash-bin/files/logstash.confd2
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################
-# Default settings for logstash
-###############################
-
-# Set a home directory
-#LS_HOME=/var/lib/logstash
-
-# Arguments to pass to logstash agent
-#LS_OPTS=""
-
-# Arguments to pass to java
-#LS_HEAP_SIZE="500m"
-#LS_JAVA_OPTS="-Djava.io.tmpdir=$HOME"
-
-# pidfiles location
-#LS_PIDFILE=/run/logstash/logstash.pid
-
-# 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 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 b/app-admin/logstash-bin/files/logstash.initd
index eee6c09a16..0a0f7ad11b 100644
--- a/app-admin/logstash-bin/files/logstash.initd
+++ b/app-admin/logstash-bin/files/logstash.initd
@@ -4,7 +4,7 @@
 
 LS_USER=${LS_USER:-logstash}
 LS_GROUP=${LS_GROUP:-$LS_USER}
-LS_LOG_FILE=${LS_LOG_FILE:-/var/log/logstash/logstash.log}
+LS_LOG_DIR=${LS_LOG_DIR:-/var/log/logstash}
 LS_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
 LS_HOME=${LS_HOME:-/var/lib/logstash}
 LS_HEAP_SIZE=${LS_HEAP_SIZE:-500m}
@@ -14,8 +14,10 @@ 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}
 
-command="/opt/logstash/bin/logstash"
-command_args="agent --config ${LS_CONF_DIR} --log ${LS_LOG_FILE} ${LS_OPTS}"
+LS_INSTALL_DIR="/opt/logstash"
+
+command="${LS_INSTALL_DIR}/bin/logstash"
+command_args="--path.config ${LS_CONF_DIR} --path.logs ${LS_LOG_DIR} ${LS_OPTS}"
 command_background="true"
 pidfile=${LS_PIDFILE:-"/run/logstash/logstash.pid"}
 
@@ -36,7 +38,7 @@ checkconfig() {
 	fi
 
 	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
+	${command} ${command_args} --config.test_and_exit
 	eend $? "Configuration error. Please fix your configuration files."
 }
 
@@ -52,14 +54,17 @@ start_pre() {
 
 	rc_ulimit="-n ${LS_OPEN_FILES}"
 
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOG_FILE}")"
-	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOG_FILE}"
+	local d
+	for d in "${LS_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
+		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
+		chown -R "${LS_USER}":"${LS_GROUP}" "$d"
+	done
+
 }
 
 stop() {
 	ebegin "Stopping logstash"
-	if [ "${KILL_ON_STOP_TIMEOUT}" == "1" ]; then
+	if [ "${KILL_ON_STOP_TIMEOUT}" = "1" ]; then
 		start-stop-daemon --stop \
 			--pidfile=${pidfile} \
 			--retry=TERM/5/KILL/5

diff --git a/app-admin/logstash-bin/files/logstash.initd4 b/app-admin/logstash-bin/files/logstash.initd4
deleted file mode 100644
index 0a0f7ad11b..0000000000
--- a/app-admin/logstash-bin/files/logstash.initd4
+++ /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_CONF_DIR=${LS_CONF_DIR:-/etc/logstash/conf.d}
-LS_HOME=${LS_HOME:-/var/lib/logstash}
-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.logs ${LS_LOG_DIR} ${LS_OPTS}"
-command_background="true"
-pidfile=${LS_PIDFILE:-"/run/logstash/logstash.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} --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_INSTALL_DIR}/data" "$(dirname "${pidfile}")" "${LS_LOG_DIR}"; do
-		checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$d"
-		chown -R "${LS_USER}":"${LS_GROUP}" "$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
-}

diff --git a/app-admin/logstash-bin/logstash-bin-2.4.0-r3.ebuild b/app-admin/logstash-bin/logstash-bin-2.4.0-r3.ebuild
deleted file mode 100644
index 65d79b9585..0000000000
--- a/app-admin/logstash-bin/logstash-bin-2.4.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit user
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="!all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz )
-	all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-all-plugins-${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="all-plugins"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
-}
-
-pkg_postinst() {
-	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
-	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
-	ewarn "/etc/conf.d/${MY_PN}"
-	einfo
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}

diff --git a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
index 0dc59f4961..528bf276b7 100644
--- a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
@@ -16,12 +16,10 @@ SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 RESTRICT="strip"
 QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
 
-DEPEND=""
 RDEPEND="virtual/jre:1.8"
 
 S="${WORKDIR}/${MY_P}"
@@ -36,7 +34,7 @@ src_install() {
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample2" agent.conf
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
@@ -45,8 +43,8 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
-	newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
 }
 
 pkg_postinst() {

diff --git a/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
index 243107ac92..528bf276b7 100644
--- a/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
@@ -34,7 +34,7 @@ src_install() {
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample2" agent.conf
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
 
 	insinto "/opt/${MY_PN}"
 	doins -r .
@@ -43,8 +43,8 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
 
-	newconfd "${FILESDIR}/${MY_PN}.confd2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd4" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
 }
 
 pkg_postinst() {

diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index 7f21da6f09..86e0bec1b1 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -17,9 +17,6 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
-  <use>
-    <flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
-  </use>
   <upstream>
     <remote-id type="github">elastic/logstash</remote-id>
   </upstream>


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2017-05-24 13:27 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2017-05-24 13:27 UTC (permalink / raw
  To: gentoo-commits

commit:     e56290541c7ea6d6c20b3dc0f6aa284e7353fb53
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed May 24 09:39:32 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 24 13:21:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5629054

app-admin/logstash-bin: bump to 5.3.2/5.4.0, drop old

Closes: https://github.com/gentoo/gentoo/pull/4744
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-admin/logstash-bin/Manifest                           |  4 ++--
 app-admin/logstash-bin/files/agent.conf.sample            | 14 ++++++++++++--
 ...ogstash-bin-5.3.1.ebuild => logstash-bin-5.3.2.ebuild} |  3 ++-
 ...ogstash-bin-5.1.2.ebuild => logstash-bin-5.4.0.ebuild} | 15 +++++++--------
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index f3f31f6eb59..abff0d7e217 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,3 @@
-DIST logstash-5.1.2.zip 100044055 SHA256 99fd514b6241310c78aefca2cd895c1cec4cd426aa08fccf7e8bba26567573c3 SHA512 4186f942dd555dc1284bc657cbd3a61de8aa67a50bd2f7b725d3364e5fca61029cadb0ca4f9e1c4a36078805fd015128ddcd7773e19e643eaddd5ae2fa9c6673 WHIRLPOOL 1127a419a35e42de59a4bd61fe5b75e39daad69d0646019417abf83f44639a86fd2b1ffc687b6cc551562045ef3d2d901d7985437d158094d4d054e4a93bfd5d
 DIST logstash-5.2.2.zip 100068713 SHA256 35bd0378f5b9001b4c3056b11496936ef47c09e3ddc469353bc8951e3b81e174 SHA512 923b35e8bcc97f6036cd4a484df546b2cc1341ec8fe5080bea8f979856086aaaae5f71fa0c3f7aee2207f7c3e71aec18af416278123362f89990c05ec9e2c92f WHIRLPOOL 4a67ed0ba3b532da5d488b2e45f53149b4e63b6b638b6fe1058a13eab904cb7ec24cd87306868a4770fe6aadfe13f7d76bfc9973e73104a8e4e9aee455321c32
-DIST logstash-5.3.1.zip 100150030 SHA256 f5e626a8cfe128b7ebaa0ec8ddc20876913852efd91c2c81a1f19f2223e00e07 SHA512 7897eab56bc33ee38169ad34e600cdf7180d0af30f93811f1ecf30a107944cd7a5ab2e95805695da7c1ce6f2112424c17de3b3bd9efaf344daff4e227d5e3d90 WHIRLPOOL 12383a43c372a2eef31b0a64e1b14f304ea90f7202524f6d56b7f0f51fcefd029f45b7f2782050d3c89269e41ae96c02e78586db30bb5d509f45b19508c36be3
+DIST logstash-5.3.2.zip 100247384 SHA256 b0dfe9295c86dc4efbc1b0884c8078fd414e2e96480c3b513b2a92dab47cb505 SHA512 c150a3076b035204677275081267ac781b34d7abd1e93214cf79d73c326afb58b24ebd91453dd6fb7ba3157cb28de9b319e077e07e4b0cb3db939b99174b130b WHIRLPOOL 83d8b347266e0846b2967b6c11c6615dd3a438d8eaf5dbe057caf7569a6f64ff39a352b56b9ef9127d045d7a37d484a5a09130961cbe190946d7f1b52a66251a
+DIST logstash-5.4.0.zip 98567077 SHA256 f7a817009f7458cb186d652497e68003c221b07dbf28b5097a66b40ffb022a2a SHA512 4d552d43a1817ba04d25a3ada1cf87ecdae632a520627d3b6cb514b7e3384a6a09a98e8f24ea19328c60c4549b9dd1eb0e1a5282665f85877afbd7e7fef88e71 WHIRLPOOL 25dc935abee1ae1852c83801d50fc08bc2896e2744282f219e2afef4e9da5f608472baf4f88b31127959495d320643bbf7f94d7fea809b15d8186f333649ad0e

diff --git a/app-admin/logstash-bin/files/agent.conf.sample b/app-admin/logstash-bin/files/agent.conf.sample
index adf29e1e133..85c9b5c93d2 100644
--- a/app-admin/logstash-bin/files/agent.conf.sample
+++ b/app-admin/logstash-bin/files/agent.conf.sample
@@ -1,12 +1,22 @@
 input {
-    stdin {
-        type => "stdin"
+    beats {
+      port => 5044
     }
 
+    # may need root privileges
     file {
         type => "syslog"
         path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
     }
+
+    redis {
+      key => logstash
+      data_type => list
+    }
+
+    stdin {
+        type => "stdin"
+    }
 }
 
 output {

diff --git a/app-admin/logstash-bin/logstash-bin-5.3.1.ebuild b/app-admin/logstash-bin/logstash-bin-5.3.2.ebuild
similarity index 95%
rename from app-admin/logstash-bin/logstash-bin-5.3.1.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.3.2.ebuild
index cda22abd473..fbb7c1bfc37 100644
--- a/app-admin/logstash-bin/logstash-bin-5.3.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.3.2.ebuild
@@ -12,7 +12,8 @@ DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 
-LICENSE="Apache-2.0"
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 

diff --git a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
similarity index 80%
rename from app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
index 668a90ad7ac..f5c4d8c2e29 100644
--- a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
@@ -12,7 +12,8 @@ DESCRIPTION="Tool for managing events and logs"
 HOMEPAGE="https://www.elastic.co/products/logstash"
 SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
 
-LICENSE="Apache-2.0"
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
@@ -51,11 +52,9 @@ pkg_postinst() {
 	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
 	ewarn "${EROOT%/}/etc/conf.d/${MY_PN}"
 	einfo
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
+	einfo "Installing plugins: (bug #601294)"
+	einfo "DEBUG=1 JARS_SKIP='true' bin/logstash-plugin install logstash-output-gelf"
+	einfo
+	einfo "Sample configuration:"
+	einfo "${EROOT%/}/usr/share/${MY_PN}"
 }


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2017-08-16 14:24 Michał Górny
  0 siblings, 0 replies; 13+ messages in thread
From: Michał Górny @ 2017-08-16 14:24 UTC (permalink / raw
  To: gentoo-commits

commit:     15b28a3312f35244dbe093946f127d046555f42a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 08:39:45 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 14:23:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b28a33

app-admin/logstash-bin: retain user installed plugins (Bug #622602)

Closes: https://github.com/gentoo/gentoo/pull/5098
Package-Manager: Portage-2.3.7, Repoman-2.3.2

 .../logstash-bin/files/logstash-plugin.eselect     | 85 ++++++++++++++++++++++
 ...n-5.4.3.ebuild => logstash-bin-5.4.3-r1.ebuild} | 17 ++++-
 2 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/app-admin/logstash-bin/files/logstash-plugin.eselect b/app-admin/logstash-bin/files/logstash-plugin.eselect
new file mode 100644
index 00000000000..29678309f41
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash-plugin.eselect
@@ -0,0 +1,85 @@
+# -*-eselect-*-  vim: ft=eselect
+# Copyright 2005-2017 Gentoo Foundation
+# Distributed under the terms of the GNU GPL version 2 or later
+
+DESCRIPTION="Manage user installed plugins of logstash"
+MAINTAINER="hydrapolic@gmail.com"
+
+PLUGINS="/var/lib/logstash/plugins-list.txt"
+LS_INSTALL_DIR="/opt/logstash"
+
+ls_plugin_wrapper() {
+  JARS_SKIP=true "${LS_INSTALL_DIR}/bin/logstash-plugin" "${1}" "${2}" || die
+}
+
+### install action
+describe_install() {
+  echo "Install plugin"
+}
+
+describe_install_parameters() {
+  echo "<plugin>"
+}
+
+do_install() {
+  [[ ${#} -lt 1 ]] && die "Please specify at least one plugin"
+
+  local plugin
+  for plugin; do
+    ls_plugin_wrapper install "${plugin}"
+    echo "${plugin}" >> "${PLUGINS}" || die
+  done
+
+  sort -u "${PLUGINS}" > "${PLUGINS}.tmp" || die
+  mv "${PLUGINS}.tmp" "${PLUGINS}" || die
+}
+
+### list action
+describe_list() {
+  echo "List user installed plugins"
+}
+
+do_list() {
+  if [[ -f "${PLUGINS}" ]]; then
+    write_list_start "Installed plugins:"
+
+    local plugin
+    while read -r plugin; do
+      write_kv_list_entry "${plugin}"
+    done < "${PLUGINS}"
+  fi
+}
+
+### reinstall action
+describe_reinstall() {
+  echo "Reinstall plugins"
+}
+
+do_reinstall() {
+  if [[ -f "${PLUGINS}" ]]; then
+    local plugin
+    while read -r plugin; do
+      ls_plugin_wrapper install "${plugin}"
+    done < "${PLUGINS}"
+  fi
+}
+
+### uninstall action
+describe_uninstall() {
+  echo "Uninstall plugin"
+}
+
+describe_uninstall_parameters() {
+  echo "<plugin>"
+}
+
+do_uninstall() {
+  if [[ -f "${PLUGINS}" ]]; then
+    local plugin
+    for plugin; do
+      grep "^${plugin}\$" "${PLUGINS}" || write_warning_msg "Plugin ${plugin} not recorded"
+      sed -i "/^${plugin}\$/d" "${PLUGINS}" || die
+      ls_plugin_wrapper remove "${plugin}"
+    done
+  fi
+}

diff --git a/app-admin/logstash-bin/logstash-bin-5.4.3.ebuild b/app-admin/logstash-bin/logstash-bin-5.4.3-r1.ebuild
similarity index 72%
rename from app-admin/logstash-bin/logstash-bin-5.4.3.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.4.3-r1.ebuild
index f5c4d8c2e29..f8c948c748c 100644
--- a/app-admin/logstash-bin/logstash-bin-5.4.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.4.3-r1.ebuild
@@ -31,6 +31,7 @@ pkg_setup() {
 
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
 	keepdir "/var/log/${MY_PN}"
 
 	insinto "/usr/share/${MY_PN}"
@@ -45,15 +46,27 @@ src_install() {
 
 	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
 	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
 }
 
 pkg_postinst() {
 	ewarn "The default user changed from root to ${MY_PN}. If you wish to run as root (for"
 	ewarn "example to read local logs), be sure to change LS_USER and LS_GROUP in"
 	ewarn "${EROOT%/}/etc/conf.d/${MY_PN}"
+	ewarn
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	einfo
+	einfo "Installing plugins:"
+	einfo "eselect logstash-plugin install logstash-output-gelf"
 	einfo
-	einfo "Installing plugins: (bug #601294)"
-	einfo "DEBUG=1 JARS_SKIP='true' bin/logstash-plugin install logstash-output-gelf"
+
+	einfo "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
 	einfo
 	einfo "Sample configuration:"
 	einfo "${EROOT%/}/usr/share/${MY_PN}"


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2017-09-30  8:59 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2017-09-30  8:59 UTC (permalink / raw
  To: gentoo-commits

commit:     40abb7425abfcc1d7fb7b65f94715210847fae1a
Author:     Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Sep 27 15:18:32 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 08:59:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40abb742

app-admin/logstash-bin: version bump to 5.6.2.

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Closes: https://bugs.gentoo.org/621112
Closes: https://bugs.gentoo.org/627528
Closes: https://github.com/gentoo/gentoo/pull/5798

 app-admin/logstash-bin/Manifest                  |  1 +
 app-admin/logstash-bin/files/logstash.confd-r1   | 40 ++++++++++++
 app-admin/logstash-bin/files/logstash.initd-r1   | 75 +++++++++++++++++++++++
 app-admin/logstash-bin/logstash-bin-5.6.2.ebuild | 77 ++++++++++++++++++++++++
 4 files changed, 193 insertions(+)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index a407019018c..06ee987a95a 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,2 +1,3 @@
 DIST logstash-5.5.3.zip 99551442 SHA256 f81ff55feb21ff4edd4283938ac8362c2906d98f9427d8660dab8465e08f0da9 SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa WHIRLPOOL d3482df4a7729f6b34973816e39315c69254a641e9811131d7d5e12ede54003a326c5773e799ee471dda01a6113762919ea81ab56ede62d29221f63ed5a7f8c7
 DIST logstash-5.6.1.zip 107893345 SHA256 a484176009af9f9a526360a529e2777e18a8928b50a223bb0823bfa45da958c6 SHA512 d2ddc62e14013ed69e2666cb3831bec2cd22f5bcdb147ec431fe1effa64bcb4f8feb2ea77a1c0b43deefeec9a502effe1975a2061c632c57b58b36b5010cb17d WHIRLPOOL f430a452b815e44147bf22b6ed7ab1df01cfe27ec44f2f38007127899cb7408d626f2090efba2ebddd22fd95731ed8df971d3e7793c35b174681ecbb02914ba3
+DIST logstash-5.6.2.zip 107836581 SHA256 ae339c18e0f68c3b98faceff6857369ef6488916e191f1598e4b01b1855b8533 SHA512 7c944c121091053be72fea4546142aa79ea2103aef0009752f9ddceaaafdad2ff91ef1d2495d1e7bccb8e3c18c70353f6359adba5bb737aff860f5d500ff198c WHIRLPOOL ff28ed652c108dac01156eed2adc693ad9c166636bf7be805584742d49da7a575562582af9c381fd73785a6ad2c53e4777d0ac1dca8a51dfc30867b569e973dd

diff --git a/app-admin/logstash-bin/files/logstash.confd-r1 b/app-admin/logstash-bin/files/logstash.confd-r1
new file mode 100644
index 00000000000..5f59b606fed
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r1
@@ -0,0 +1,40 @@
+###############################
+# 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
new file mode 100644
index 00000000000..2e7350d06f5
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r1
@@ -0,0 +1,75 @@
+#!/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
+}

diff --git a/app-admin/logstash-bin/logstash-bin-5.6.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.2.ebuild
new file mode 100644
index 00000000000..05628cebc54
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-5.6.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/startup.options
+	insinto /etc/${MY_PN}
+	doins config/*
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+	ewarn "Please ensure any running logstash processes are shut down cleanly."
+	ewarn
+	ewarn "The default data directory has been moved from /opt/logstash/data to"
+	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+	ewarn
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	einfo
+	einfo "Installing plugins:"
+	einfo "eselect logstash-plugin install logstash-output-gelf"
+	einfo
+
+	einfo "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	einfo
+	einfo "Sample configuration:"
+	einfo "${EROOT%/}/usr/share/${MY_PN}"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/
@ 2020-11-14  9:49 Mikle Kolyada
  0 siblings, 0 replies; 13+ messages in thread
From: Mikle Kolyada @ 2020-11-14  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     0e4bd2e492ff5e3b1a1fcfaa727ee0746b8e8589
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Sat Nov 14 03:27:28 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 09:49:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4bd2e4

app-admin/logstash-bin: bump to 6.8.13, 7.9.3, 7.10.0

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 app-admin/logstash-bin/Manifest                   |  6 ++
 app-admin/logstash-bin/files/logstash.initd-r2    |  1 +
 app-admin/logstash-bin/logstash-bin-6.8.13.ebuild | 73 +++++++++++++++++++
 app-admin/logstash-bin/logstash-bin-7.10.0.ebuild | 89 +++++++++++++++++++++++
 app-admin/logstash-bin/logstash-bin-7.9.3.ebuild  | 89 +++++++++++++++++++++++
 5 files changed, 258 insertions(+)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index bf353bcd7ec..a1dfb96625b 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,14 +1,20 @@
 DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
 DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4041b19f94c96e747d6398576aef2f3d3cefed311301ca40eef8c6cd8ce4ac2b042a08d664b7e7f83a0df226bef90db SHA512 4070e813ab39b884f05197b9c8c983770af93bfc52bb7f31dd5eb375d509b31f56a5aca5b8a7011acb4fa506d991bef8567e6f4b2f0ee72cfce67089c80bcb47
+DIST logstash-6.8.13.tar.gz 176911221 BLAKE2B 644dc67dea638e2e2307e807bf2f08e9758db4f8b1a01deb13585b925ceeaaaafba0e573f125c095603b5c7e5329ae82677472c72f53af9d26d792de31c896ed SHA512 f253b566e8f67063bea6dd183ca495d7b53b0062566278e0937af71763fb0b3339ef90c7620edd3370719faa2c49a162e1757141fa60b7136e9d9c3d83657d32
+DIST logstash-7.10.0-linux-x86_64.tar.gz 351102587 BLAKE2B 47f8d84d4d42a313e9c2b17fbf3b0aaf3a22145b3ba27a5f6a272e9698c4a21ef061752010ee8c37539373c033eca910ba21f799e87a9f155141a1bd09cbf3e5 SHA512 f9484bb2e3511ee172fc96b7cd0649a5ecc581f31672f54690e03d0efae65e0dda091143db3486a671012b5c7382bd40d8aa18ca39768fdc88f4c7a4e5b373ff
 DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
 DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
 DIST logstash-7.9.1.tar.gz 158473271 BLAKE2B deeaccb5dd1c9acc52ee395e699fa67d816dfb4144068409f375c20a161837d07f4b0ad269f044076104bc57d84d2decf2bbb4bce17c00737afb74186e706ebb SHA512 d7e359523f4a7deba095d6a1a71f141c29ecc4cf58cdd5f81ea5af80d30be9716b1a9c824d4fc000cafc9457cf7d587d346fd8b1d0d04411a7fd8d280054671d
 DIST logstash-7.9.2.tar.gz 158690951 BLAKE2B a50d959d0d032896b64f2957f299efead1ef51cda77c440f612500ba7193bc8cc81b092c59513dc70a412cf813920df4da5cadff5a494136c5d284d5b9060f34 SHA512 54ec3f58f6fea9d8dee9cbe8eaf755bb9f5d26858082f6594f6fe5f006af6e3f2ee2d5899ada71ef4ad6856d27c0c91ad7a0769aea16c09a8cf6ab234ffc939e
+DIST logstash-7.9.3.tar.gz 158711139 BLAKE2B 5a5426e3ee41e3f985318e7356a3b13df1042b887a627824e9d14a73839e648ea6291333921902320b20cc3e474a15d9b1f4c76bfcfdc0b6aaa08ed098df0ae4 SHA512 f4bfc97203bcad589d3682a4dfd8f7e6172efa958775541b128f43b151cedf4065b1eab012d60a8aa5005dbb504e4c3638a26492c30fba3ba5b271ad17876f25
 DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
 DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94
+DIST logstash-oss-6.8.13.tar.gz 176780212 BLAKE2B 68a5f262023f75525e8b8f98d279920011a0a4cbb34c7297c51f3e45034ab12ca2e2f57b2bb22453107e24fdbca65f16f73a69776fbfd321ea87c6fd1b8d0292 SHA512 0919c8f7bbf39ac9cb41d0065267eb39ba359393e629bf360d6795a68efc9444ab99c7287c533b53efe9ec74fbe403ebe5e5e178b42c48b92d79281a3a5f2045
+DIST logstash-oss-7.10.0-linux-x86_64.tar.gz 350920148 BLAKE2B 77f2a8668a7b3e46224da7383b34ebe632360d833a5f99d010afe94e48d5f3ac2431fb1f220bdf28b9bdb1a8639f9f64db07862bf24c4f340caba2403d60ac0c SHA512 b9deffe41ef051c851b6a456cebcf66cd2a17de6f49dcac8cdb29189ebbcac0ee286b9973456fa8a37bebbf7ba34295cd192f1f5c9dbbdde7da71fde126c230e
 DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
 DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
 DIST logstash-oss-7.9.1.tar.gz 158289592 BLAKE2B 91d89b4375e51721a5d3181b916cdac33b65e4a020bdec57b3bece9b25595e1588366c69c9e07e4c25b148b4ed2703eef936d1924fac7387fb25cf750226f089 SHA512 ddd6c0db8b59b9ad719a69f04eea81e0261061b5a26569819d4c9306c6f3a63acf575bf50e5f22b17e9b44ed8750d83762b41b866a25b2a2e283b5186c9cdf61
 DIST logstash-oss-7.9.2.tar.gz 158510234 BLAKE2B 568f5ba0ebe2baf75211af2e4c859ec5496e28149a060d7688606b56a7972924f0a163914f1c085bc2600694bfc7363fa5300785457f64f3210b97e1074c7210 SHA512 dbd83299a5b3ec76f3e4b235d0b6aff9aad2ab395412b570e3ef82c2ba761a1899a7009b117af9b13b623c00579f323751da7b54c613047efa2558394a19387d
+DIST logstash-oss-7.9.3.tar.gz 158530838 BLAKE2B 0a37f05a42848e6d99ac6741f7fa92a73794d292ad72f793754805d45bdff940163875046258148f71cf953ce40be8747d201d0782de0cf60f2ed16db0136b29 SHA512 13d7a2e417d061b838c8be8a2a874f5964fd32c70cb437ab4bab7c4f8a17882b7874dabe53ba6a588250e56557e972b6d1f5be7970debbfbd893d4532705e6f2

diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
index e05c837ae70..e76f00ff9a3 100644
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -21,6 +21,7 @@ command="${LS_INSTALL_DIR}/bin/logstash"
 command_args="--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"
+retry="30"
 
 start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
 	--chdir ${LS_HOME}

diff --git a/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
new file mode 100644
index 00000000000..08167fb0287
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}

diff --git a/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild
new file mode 100644
index 00000000000..e016d18660d
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.10.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}

diff --git a/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
new file mode 100644
index 00000000000..f4705732966
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="acct-group/logstash
+	acct-user/logstash
+	virtual/jre"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/usr/share/${MY_PN}"
+	newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+	rm -v config/{pipelines.yml,startup.options} || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	doins "${FILESDIR}/pipelines.yml"
+	rm -rv config data || die
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+	ewarn "Install the plugins via eselect module that will automatically re-install"
+	ewarn "all self installed plugins after Logstash upgrades."
+	elog
+	elog "Installing plugins:"
+	elog "eselect logstash-plugin install logstash-output-gelf"
+	elog
+
+	elog "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	elog
+	elog "Sample configuration:"
+	elog "${EROOT}/usr/share/${MY_PN}"
+	elog
+	elog "The default pipeline configuration expects the configuration(s) to be found in:"
+	elog "${EROOT}/etc/logstash/conf.d/*.conf"
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2020-11-14  9:49 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-09 10:26 [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/files/, app-admin/logstash-bin/ Ian Delaney
  -- strict thread matches above, loose matches on Subject: below --
2016-04-05  9:50 Patrick Lauer
2016-04-05  9:50 Patrick Lauer
2016-04-12  6:07 Ian Delaney
2016-10-28 19:25 Patrick Lauer
2016-12-23  8:20 Göktürk Yüksek
2016-12-29 12:18 Michael Palimaka
2017-01-17 22:54 Patrice Clement
2017-02-13 15:01 Andrew Savchenko
2017-05-24 13:27 Michał Górny
2017-08-16 14:24 Michał Górny
2017-09-30  8:59 Patrice Clement
2020-11-14  9:49 Mikle Kolyada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox