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

Package-Manager: portage-2.2.27

9 files changed, 13 insertions, 85 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index a4a1c8d9875a..3082fe09157a 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 9d125cd6a25e..96781bd3327b 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 96781bd3327b..000000000000
--- 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
index cb6839569537..cb6839569537 100644
--- a/app-admin/logstash-bin/files/logstash.confd-r2
+++ b/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 b101e86c8c99..000000000000
--- 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
index e4abf59b0fa0..a61395018b7f 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 c65f098c2151..000000000000
--- 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
index f7b2060e0a29..7348984dbaf9 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
index f165b2a1a9de..479b7a4fcbb4 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() {