[arch-commits] Commit in logstash/repos (24 files)
Levente Polyak
anthraxx at archlinux.org
Tue Sep 19 19:54:34 UTC 2017
Date: Tuesday, September 19, 2017 @ 19:54:33
Author: anthraxx
Revision: 258849
archrelease: copy trunk to community-i686, community-x86_64
Added:
logstash/repos/community-i686/PKGBUILD
(from rev 258848, logstash/trunk/PKGBUILD)
logstash/repos/community-i686/bundle.config
(from rev 258848, logstash/trunk/bundle.config)
logstash/repos/community-i686/logstash-sysuser.conf
(from rev 258848, logstash/trunk/logstash-sysuser.conf)
logstash/repos/community-i686/logstash-tmpfile.conf
(from rev 258848, logstash/trunk/logstash-tmpfile.conf)
logstash/repos/community-i686/logstash.service
(from rev 258848, logstash/trunk/logstash.service)
logstash/repos/community-i686/logstash at .service
(from rev 258848, logstash/trunk/logstash at .service)
logstash/repos/community-x86_64/PKGBUILD
(from rev 258848, logstash/trunk/PKGBUILD)
logstash/repos/community-x86_64/bundle.config
(from rev 258848, logstash/trunk/bundle.config)
logstash/repos/community-x86_64/logstash-sysuser.conf
(from rev 258848, logstash/trunk/logstash-sysuser.conf)
logstash/repos/community-x86_64/logstash-tmpfile.conf
(from rev 258848, logstash/trunk/logstash-tmpfile.conf)
logstash/repos/community-x86_64/logstash.service
(from rev 258848, logstash/trunk/logstash.service)
logstash/repos/community-x86_64/logstash at .service
(from rev 258848, logstash/trunk/logstash at .service)
Deleted:
logstash/repos/community-i686/PKGBUILD
logstash/repos/community-i686/bundle.config
logstash/repos/community-i686/logstash-sysuser.conf
logstash/repos/community-i686/logstash-tmpfile.conf
logstash/repos/community-i686/logstash.service
logstash/repos/community-i686/logstash at .service
logstash/repos/community-x86_64/PKGBUILD
logstash/repos/community-x86_64/bundle.config
logstash/repos/community-x86_64/logstash-sysuser.conf
logstash/repos/community-x86_64/logstash-tmpfile.conf
logstash/repos/community-x86_64/logstash.service
logstash/repos/community-x86_64/logstash at .service
----------------------------------------+
/PKGBUILD | 152 +++++++++++++++++++++++++++++++
/bundle.config | 8 +
/logstash-sysuser.conf | 2
/logstash-tmpfile.conf | 10 ++
/logstash.service | 46 +++++++++
/logstash at .service | 14 ++
community-i686/PKGBUILD | 70 --------------
community-i686/bundle.config | 4
community-i686/logstash-sysuser.conf | 1
community-i686/logstash-tmpfile.conf | 5 -
community-i686/logstash.service | 23 ----
community-i686/logstash at .service | 7 -
community-x86_64/PKGBUILD | 70 --------------
community-x86_64/bundle.config | 4
community-x86_64/logstash-sysuser.conf | 1
community-x86_64/logstash-tmpfile.conf | 5 -
community-x86_64/logstash.service | 23 ----
community-x86_64/logstash at .service | 7 -
18 files changed, 232 insertions(+), 220 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-i686/PKGBUILD 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,70 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=logstash
-pkgver=5.6.0
-pkgrel=1
-pkgdesc='Tool for managing events and logs'
-url='https://www.elastic.co/products/logstash/'
-arch=('i686' 'x86_64')
-license=('Apache')
-depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler')
-makedepends=('java-environment>=8' 'gradle' 'git')
-backup=('etc/conf.d/logstash'
- 'etc/logstash/logstash.yml')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/v${pkgver}.tar.gz
- logstash.service
- logstash at .service
- logstash-sysuser.conf
- logstash-tmpfile.conf
- bundle.config)
-sha256sums=('c0dbb175773af340c6079a8fe69a1c080835e0e66e6cb92706611beac13d1d67'
- '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
- 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
- '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
- 'b0c334b9f6f5450d0d6e801dbe43972bf32ead92705a389df891a32aa803a55f'
- 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('fa80d7d01a7b1bce786f918147ebfe0417251f9ffb130431f59a700f5bcb98f50e14692b6e7987bae45fd5a8f1b0a0f2f2017837a90397d42c6f743a26cccc20'
- '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
- 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
- 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
- '6b67bc195da2b137d63de9ee79033e0a0f56a822b6f620827d3ee9dcf7f1174cff2716f27dc055580dcda345a5c876ea551444858b2a8fa6c9e4df7d551cdb6b'
- '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- rm bin/*.bat
- sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
- sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- rake bootstrap
- rake plugin:install-default
-
- rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache
- cd vendor/jruby/lib/jni
- rm -r *Darwin *Windows *SunOS *FreeBSD arm-* ppc64*
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- install -dm 755 "${pkgdir}"/usr/share "${pkgdir}"/etc/conf.d
- mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
- mv config "${pkgdir}/etc/logstash"
- chmod 750 "${pkgdir}/etc/logstash"
- cp -a . "${pkgdir}/usr/share/logstash"
-
- install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
- install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
- install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
- install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
-
- install -dm 755 "${pkgdir}/var/lib/logstash"
- install -dm 755 "${pkgdir}/var/log/logstash"
- install -dm 755 "${pkgdir}/etc/logstash/conf.d"
-}
-
-# vim: ts=2 sw=2 et:
Copied: logstash/repos/community-i686/PKGBUILD (from rev 258848, logstash/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,76 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=logstash
+pkgver=5.6.1
+pkgrel=1
+pkgdesc='Tool for managing events and logs'
+url='https://www.elastic.co/products/logstash/'
+arch=('i686' 'x86_64')
+license=('Apache')
+depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler')
+# TODO: switch to up-to-date rake when 6.x arrives
+makedepends=('java-environment>=8' 'gradle' 'git' 'ruby2.3')
+backup=('etc/conf.d/logstash'
+ 'etc/logstash/logstash.yml')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/v${pkgver}.tar.gz
+ ${pkgname}-5.6.1-fix-jruby.patch::https://github.com/elastic/logstash/commit/d2cde417d9dd0151c9d1b1dad050a38b14a18c6f.patch
+ logstash.service
+ logstash at .service
+ logstash-sysuser.conf
+ logstash-tmpfile.conf
+ bundle.config)
+sha256sums=('7d911858c18484cc290aa71a7ae6401a6bd067313d6c220abf85d3c68072c8a9'
+ '6821843a34cfbd940e95934ea6f7e6a67e4466e5732dc759706d1a7653d0776a'
+ '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
+ 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
+ '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
+ 'b0c334b9f6f5450d0d6e801dbe43972bf32ead92705a389df891a32aa803a55f'
+ 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
+sha512sums=('9026af2f4eae2c43a0c0bc20f694980a0dde420e5b81024d913f4348ebdd8c58597e6bdeea41019ebc4bb2d0926996890de0bb7fed466c76d842455001d57f8d'
+ '97a699e3c33d67e8eaeb8a41f4803c3311f02e9f063eb96820a886fe5537a82c66f1e320b5fea6ba01a4a2075e0f3aef5cc651ca6f46a972add9dc54d78c5ee2'
+ '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
+ 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
+ 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
+ '6b67bc195da2b137d63de9ee79033e0a0f56a822b6f620827d3ee9dcf7f1174cff2716f27dc055580dcda345a5c876ea551444858b2a8fa6c9e4df7d551cdb6b'
+ '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ rm bin/*.bat
+ sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
+ sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ msg "Rake bootstrap..."
+ /opt/ruby2.3/bin/rake bootstrap
+ msg "Rake plugin:install-default..."
+ /opt/ruby2.3/bin/rake plugin:install-default
+
+ rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache .gradle
+ cd vendor/jruby/lib/jni
+ rm -r *Darwin *Windows *SunOS *FreeBSD arm-* ppc64*
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ install -dm 755 "${pkgdir}"/usr/share "${pkgdir}"/etc/conf.d
+ mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
+ mv config "${pkgdir}/etc/logstash"
+ chmod 750 "${pkgdir}/etc/logstash"
+ cp -a . "${pkgdir}/usr/share/logstash"
+
+ install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
+ install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
+ install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
+ install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
+
+ install -dm 755 "${pkgdir}/var/lib/logstash"
+ install -dm 755 "${pkgdir}/var/log/logstash"
+ install -dm 755 "${pkgdir}/etc/logstash/conf.d"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/bundle.config
===================================================================
--- community-i686/bundle.config 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-i686/bundle.config 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,4 +0,0 @@
----
-BUNDLE_PATH: /usr/share/logstash/vendor/bundle
-BUNDLE_WITHOUT: build:development
-BUNDLE_GEMFILE: /usr/share/logstash/Gemfile
Copied: logstash/repos/community-i686/bundle.config (from rev 258848, logstash/trunk/bundle.config)
===================================================================
--- community-i686/bundle.config (rev 0)
+++ community-i686/bundle.config 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,4 @@
+---
+BUNDLE_PATH: /usr/share/logstash/vendor/bundle
+BUNDLE_WITHOUT: build:development
+BUNDLE_GEMFILE: /usr/share/logstash/Gemfile
Deleted: community-i686/logstash-sysuser.conf
===================================================================
--- community-i686/logstash-sysuser.conf 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-i686/logstash-sysuser.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1 +0,0 @@
-u logstash - "Logstash user" /var/lib/logstash
Copied: logstash/repos/community-i686/logstash-sysuser.conf (from rev 258848, logstash/trunk/logstash-sysuser.conf)
===================================================================
--- community-i686/logstash-sysuser.conf (rev 0)
+++ community-i686/logstash-sysuser.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1 @@
+u logstash - "Logstash user" /var/lib/logstash
Deleted: community-i686/logstash-tmpfile.conf
===================================================================
--- community-i686/logstash-tmpfile.conf 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-i686/logstash-tmpfile.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,5 +0,0 @@
-d /var/log/logstash 0755 logstash logstash -
-d /var/lib/logstash 0755 logstash logstash -
-d /usr/share/logstash 0755 logstash logstash -
-
-d /etc/logstash 0750 logstash logstash -
Copied: logstash/repos/community-i686/logstash-tmpfile.conf (from rev 258848, logstash/trunk/logstash-tmpfile.conf)
===================================================================
--- community-i686/logstash-tmpfile.conf (rev 0)
+++ community-i686/logstash-tmpfile.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,5 @@
+d /var/log/logstash 0755 logstash logstash -
+d /var/lib/logstash 0755 logstash logstash -
+d /usr/share/logstash 0755 logstash logstash -
+
+d /etc/logstash 0750 logstash logstash -
Deleted: community-i686/logstash.service
===================================================================
--- community-i686/logstash.service 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-i686/logstash.service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,23 +0,0 @@
-[Unit]
-Description=Logstash
-Documentation=http://www.elastic.co
-After=elasticsearch.service
-
-[Service]
-Environment=LS_HOME=/var/lib/logstash
-Environment=LS_HEAP_SIZE="500m"
-Environment=LS_CONF_DIR=/etc/logstash/conf.d
-Environment=LS_LOG_DIR=/var/log/logstash
-Environment=LS_SETTINGS_DIR=/etc/logstash
-User=logstash
-Group=logstash
-ExecStart=/usr/share/logstash/bin/logstash -f $LS_CONF_DIR --path.logs $LS_LOG_DIR --path.data $LS_HOME --path.settings $LS_SETTINGS_DIR
-StandardOutput=null
-StandardError=journal
-SuccessExitStatus=143
-LimitNOFILE=65535
-TimeoutStopSec=20
-LimitMEMLOCK=infinity
-
-[Install]
-WantedBy=multi-user.target
Copied: logstash/repos/community-i686/logstash.service (from rev 258848, logstash/trunk/logstash.service)
===================================================================
--- community-i686/logstash.service (rev 0)
+++ community-i686/logstash.service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,23 @@
+[Unit]
+Description=Logstash
+Documentation=http://www.elastic.co
+After=elasticsearch.service
+
+[Service]
+Environment=LS_HOME=/var/lib/logstash
+Environment=LS_HEAP_SIZE="500m"
+Environment=LS_CONF_DIR=/etc/logstash/conf.d
+Environment=LS_LOG_DIR=/var/log/logstash
+Environment=LS_SETTINGS_DIR=/etc/logstash
+User=logstash
+Group=logstash
+ExecStart=/usr/share/logstash/bin/logstash -f $LS_CONF_DIR --path.logs $LS_LOG_DIR --path.data $LS_HOME --path.settings $LS_SETTINGS_DIR
+StandardOutput=null
+StandardError=journal
+SuccessExitStatus=143
+LimitNOFILE=65535
+TimeoutStopSec=20
+LimitMEMLOCK=infinity
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/logstash at .service
===================================================================
--- community-i686/logstash at .service 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-i686/logstash at .service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,7 +0,0 @@
-.include /usr/lib/systemd/system/logstash.service
-
-[Unit]
-Description=logstash (%I)
-
-[Service]
-Environment=LOGSTASH_CONF=/etc/logstash/%I.conf
Copied: logstash/repos/community-i686/logstash at .service (from rev 258848, logstash/trunk/logstash at .service)
===================================================================
--- community-i686/logstash at .service (rev 0)
+++ community-i686/logstash at .service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,7 @@
+.include /usr/lib/systemd/system/logstash.service
+
+[Unit]
+Description=logstash (%I)
+
+[Service]
+Environment=LOGSTASH_CONF=/etc/logstash/%I.conf
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-x86_64/PKGBUILD 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,70 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=logstash
-pkgver=5.6.0
-pkgrel=1
-pkgdesc='Tool for managing events and logs'
-url='https://www.elastic.co/products/logstash/'
-arch=('i686' 'x86_64')
-license=('Apache')
-depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler')
-makedepends=('java-environment>=8' 'gradle' 'git')
-backup=('etc/conf.d/logstash'
- 'etc/logstash/logstash.yml')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/v${pkgver}.tar.gz
- logstash.service
- logstash at .service
- logstash-sysuser.conf
- logstash-tmpfile.conf
- bundle.config)
-sha256sums=('c0dbb175773af340c6079a8fe69a1c080835e0e66e6cb92706611beac13d1d67'
- '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
- 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
- '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
- 'b0c334b9f6f5450d0d6e801dbe43972bf32ead92705a389df891a32aa803a55f'
- 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
-sha512sums=('fa80d7d01a7b1bce786f918147ebfe0417251f9ffb130431f59a700f5bcb98f50e14692b6e7987bae45fd5a8f1b0a0f2f2017837a90397d42c6f743a26cccc20'
- '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
- 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
- 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
- '6b67bc195da2b137d63de9ee79033e0a0f56a822b6f620827d3ee9dcf7f1174cff2716f27dc055580dcda345a5c876ea551444858b2a8fa6c9e4df7d551cdb6b'
- '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- rm bin/*.bat
- sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
- sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- rake bootstrap
- rake plugin:install-default
-
- rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache
- cd vendor/jruby/lib/jni
- rm -r *Darwin *Windows *SunOS *FreeBSD arm-* ppc64*
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- install -dm 755 "${pkgdir}"/usr/share "${pkgdir}"/etc/conf.d
- mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
- mv config "${pkgdir}/etc/logstash"
- chmod 750 "${pkgdir}/etc/logstash"
- cp -a . "${pkgdir}/usr/share/logstash"
-
- install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
- install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
- install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
- install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
-
- install -dm 755 "${pkgdir}/var/lib/logstash"
- install -dm 755 "${pkgdir}/var/log/logstash"
- install -dm 755 "${pkgdir}/etc/logstash/conf.d"
-}
-
-# vim: ts=2 sw=2 et:
Copied: logstash/repos/community-x86_64/PKGBUILD (from rev 258848, logstash/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,76 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=logstash
+pkgver=5.6.1
+pkgrel=1
+pkgdesc='Tool for managing events and logs'
+url='https://www.elastic.co/products/logstash/'
+arch=('i686' 'x86_64')
+license=('Apache')
+depends=('java-runtime-headless>=8' 'ruby' 'ruby-bundler')
+# TODO: switch to up-to-date rake when 6.x arrives
+makedepends=('java-environment>=8' 'gradle' 'git' 'ruby2.3')
+backup=('etc/conf.d/logstash'
+ 'etc/logstash/logstash.yml')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/elastic/logstash/archive/v${pkgver}.tar.gz
+ ${pkgname}-5.6.1-fix-jruby.patch::https://github.com/elastic/logstash/commit/d2cde417d9dd0151c9d1b1dad050a38b14a18c6f.patch
+ logstash.service
+ logstash at .service
+ logstash-sysuser.conf
+ logstash-tmpfile.conf
+ bundle.config)
+sha256sums=('7d911858c18484cc290aa71a7ae6401a6bd067313d6c220abf85d3c68072c8a9'
+ '6821843a34cfbd940e95934ea6f7e6a67e4466e5732dc759706d1a7653d0776a'
+ '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c'
+ 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876'
+ '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26'
+ 'b0c334b9f6f5450d0d6e801dbe43972bf32ead92705a389df891a32aa803a55f'
+ 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1')
+sha512sums=('9026af2f4eae2c43a0c0bc20f694980a0dde420e5b81024d913f4348ebdd8c58597e6bdeea41019ebc4bb2d0926996890de0bb7fed466c76d842455001d57f8d'
+ '97a699e3c33d67e8eaeb8a41f4803c3311f02e9f063eb96820a886fe5537a82c66f1e320b5fea6ba01a4a2075e0f3aef5cc651ca6f46a972add9dc54d78c5ee2'
+ '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69'
+ 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0'
+ 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699'
+ '6b67bc195da2b137d63de9ee79033e0a0f56a822b6f620827d3ee9dcf7f1174cff2716f27dc055580dcda345a5c876ea551444858b2a8fa6c9e4df7d551cdb6b'
+ '5091aa34cc31acd50fd2865714080cf6e67c2d437424f27e001bb409c2885a0e82eabe4ce17461d60c181f460a16df0a03d53bac6015fb731b3e5225735fd4da')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ rm bin/*.bat
+ sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash"|' -i config/startup.options
+ sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' -i bin/logstash.lib.sh
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ msg "Rake bootstrap..."
+ /opt/ruby2.3/bin/rake bootstrap
+ msg "Rake plugin:install-default..."
+ /opt/ruby2.3/bin/rake plugin:install-default
+
+ rm -r vendor/_ build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools vendor/bundle/jruby/*/cache .gradle
+ cd vendor/jruby/lib/jni
+ rm -r *Darwin *Windows *SunOS *FreeBSD arm-* ppc64*
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ install -dm 755 "${pkgdir}"/usr/share "${pkgdir}"/etc/conf.d
+ mv config/startup.options "${pkgdir}/etc/conf.d/logstash"
+ mv config "${pkgdir}/etc/logstash"
+ chmod 750 "${pkgdir}/etc/logstash"
+ cp -a . "${pkgdir}/usr/share/logstash"
+
+ install -Dm 644 "${srcdir}"/{logstash.service,logstash at .service} -t "${pkgdir}/usr/lib/systemd/system"
+ install -Dm 644 "${srcdir}/logstash-sysuser.conf" "${pkgdir}/usr/lib/sysusers.d/logstash.conf"
+ install -Dm 644 "${srcdir}/logstash-tmpfile.conf" "${pkgdir}/usr/lib/tmpfiles.d/logstash.conf"
+ install -Dm 644 "${srcdir}/bundle.config" "${pkgdir}/usr/share/logstash/.bundle/config"
+
+ install -dm 755 "${pkgdir}/var/lib/logstash"
+ install -dm 755 "${pkgdir}/var/log/logstash"
+ install -dm 755 "${pkgdir}/etc/logstash/conf.d"
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/bundle.config
===================================================================
--- community-x86_64/bundle.config 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-x86_64/bundle.config 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,4 +0,0 @@
----
-BUNDLE_PATH: /usr/share/logstash/vendor/bundle
-BUNDLE_WITHOUT: build:development
-BUNDLE_GEMFILE: /usr/share/logstash/Gemfile
Copied: logstash/repos/community-x86_64/bundle.config (from rev 258848, logstash/trunk/bundle.config)
===================================================================
--- community-x86_64/bundle.config (rev 0)
+++ community-x86_64/bundle.config 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,4 @@
+---
+BUNDLE_PATH: /usr/share/logstash/vendor/bundle
+BUNDLE_WITHOUT: build:development
+BUNDLE_GEMFILE: /usr/share/logstash/Gemfile
Deleted: community-x86_64/logstash-sysuser.conf
===================================================================
--- community-x86_64/logstash-sysuser.conf 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-x86_64/logstash-sysuser.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1 +0,0 @@
-u logstash - "Logstash user" /var/lib/logstash
Copied: logstash/repos/community-x86_64/logstash-sysuser.conf (from rev 258848, logstash/trunk/logstash-sysuser.conf)
===================================================================
--- community-x86_64/logstash-sysuser.conf (rev 0)
+++ community-x86_64/logstash-sysuser.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1 @@
+u logstash - "Logstash user" /var/lib/logstash
Deleted: community-x86_64/logstash-tmpfile.conf
===================================================================
--- community-x86_64/logstash-tmpfile.conf 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-x86_64/logstash-tmpfile.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,5 +0,0 @@
-d /var/log/logstash 0755 logstash logstash -
-d /var/lib/logstash 0755 logstash logstash -
-d /usr/share/logstash 0755 logstash logstash -
-
-d /etc/logstash 0750 logstash logstash -
Copied: logstash/repos/community-x86_64/logstash-tmpfile.conf (from rev 258848, logstash/trunk/logstash-tmpfile.conf)
===================================================================
--- community-x86_64/logstash-tmpfile.conf (rev 0)
+++ community-x86_64/logstash-tmpfile.conf 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,5 @@
+d /var/log/logstash 0755 logstash logstash -
+d /var/lib/logstash 0755 logstash logstash -
+d /usr/share/logstash 0755 logstash logstash -
+
+d /etc/logstash 0750 logstash logstash -
Deleted: community-x86_64/logstash.service
===================================================================
--- community-x86_64/logstash.service 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-x86_64/logstash.service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,23 +0,0 @@
-[Unit]
-Description=Logstash
-Documentation=http://www.elastic.co
-After=elasticsearch.service
-
-[Service]
-Environment=LS_HOME=/var/lib/logstash
-Environment=LS_HEAP_SIZE="500m"
-Environment=LS_CONF_DIR=/etc/logstash/conf.d
-Environment=LS_LOG_DIR=/var/log/logstash
-Environment=LS_SETTINGS_DIR=/etc/logstash
-User=logstash
-Group=logstash
-ExecStart=/usr/share/logstash/bin/logstash -f $LS_CONF_DIR --path.logs $LS_LOG_DIR --path.data $LS_HOME --path.settings $LS_SETTINGS_DIR
-StandardOutput=null
-StandardError=journal
-SuccessExitStatus=143
-LimitNOFILE=65535
-TimeoutStopSec=20
-LimitMEMLOCK=infinity
-
-[Install]
-WantedBy=multi-user.target
Copied: logstash/repos/community-x86_64/logstash.service (from rev 258848, logstash/trunk/logstash.service)
===================================================================
--- community-x86_64/logstash.service (rev 0)
+++ community-x86_64/logstash.service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,23 @@
+[Unit]
+Description=Logstash
+Documentation=http://www.elastic.co
+After=elasticsearch.service
+
+[Service]
+Environment=LS_HOME=/var/lib/logstash
+Environment=LS_HEAP_SIZE="500m"
+Environment=LS_CONF_DIR=/etc/logstash/conf.d
+Environment=LS_LOG_DIR=/var/log/logstash
+Environment=LS_SETTINGS_DIR=/etc/logstash
+User=logstash
+Group=logstash
+ExecStart=/usr/share/logstash/bin/logstash -f $LS_CONF_DIR --path.logs $LS_LOG_DIR --path.data $LS_HOME --path.settings $LS_SETTINGS_DIR
+StandardOutput=null
+StandardError=journal
+SuccessExitStatus=143
+LimitNOFILE=65535
+TimeoutStopSec=20
+LimitMEMLOCK=infinity
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/logstash at .service
===================================================================
--- community-x86_64/logstash at .service 2017-09-19 19:54:19 UTC (rev 258848)
+++ community-x86_64/logstash at .service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -1,7 +0,0 @@
-.include /usr/lib/systemd/system/logstash.service
-
-[Unit]
-Description=logstash (%I)
-
-[Service]
-Environment=LOGSTASH_CONF=/etc/logstash/%I.conf
Copied: logstash/repos/community-x86_64/logstash at .service (from rev 258848, logstash/trunk/logstash at .service)
===================================================================
--- community-x86_64/logstash at .service (rev 0)
+++ community-x86_64/logstash at .service 2017-09-19 19:54:33 UTC (rev 258849)
@@ -0,0 +1,7 @@
+.include /usr/lib/systemd/system/logstash.service
+
+[Unit]
+Description=logstash (%I)
+
+[Service]
+Environment=LOGSTASH_CONF=/etc/logstash/%I.conf
More information about the arch-commits
mailing list