Date: Wednesday, March 21, 2018 @ 00:21:51 Author: anthraxx Revision: 309756
archrelease: copy trunk to community-x86_64 Added: logstash/repos/community-x86_64/PKGBUILD (from rev 309755, logstash/trunk/PKGBUILD) logstash/repos/community-x86_64/bundle.config (from rev 309755, logstash/trunk/bundle.config) logstash/repos/community-x86_64/logstash-sysuser.conf (from rev 309755, logstash/trunk/logstash-sysuser.conf) logstash/repos/community-x86_64/logstash-tmpfile.conf (from rev 309755, logstash/trunk/logstash-tmpfile.conf) logstash/repos/community-x86_64/logstash.service (from rev 309755, logstash/trunk/logstash.service) logstash/repos/community-x86_64/logstash@.service (from rev 309755, logstash/trunk/logstash@.service) Deleted: 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@.service -----------------------+ PKGBUILD | 154 ++++++++++++++++++++++++------------------------ bundle.config | 8 +- logstash-sysuser.conf | 2 logstash-tmpfile.conf | 12 +-- logstash.service | 46 +++++++------- logstash@.service | 14 ++-- 6 files changed, 118 insertions(+), 118 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-03-21 00:21:26 UTC (rev 309755) +++ PKGBUILD 2018-03-21 00:21:51 UTC (rev 309756) @@ -1,77 +0,0 @@ -# $Id$ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgname=logstash -pkgver=6.2.2 -pkgrel=1 -pkgdesc='Tool for managing events and logs' -url='https://www.elastic.co/products/logstash/' -arch=('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' 'jruby') -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@.service - logstash-sysuser.conf - logstash-tmpfile.conf - bundle.config) -sha256sums=('98bb92653c12968ecec3ee40f8e8e12696540bb1789e77e9e702ddc93f2f5310' - '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c' - 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876' - '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26' - '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533' - 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1') -sha512sums=('8ff76f808f6077af6034fd353110b1f2c37442554aa6b92e525e6d4c925a2b24408beda7af35016306a8976427d35dfe26204b373df325f243ea407544936418' - '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69' - 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0' - 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699' - '05ea8af97c4f6ac9ba5518b99dc3136859edd24d8376940b48b8c7a70586c8bc188deb1079a99e19d437c39e0eb17d68e7cc3f9af4aa3ad2bc6a87c08cae94a6' - '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} - - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk - msg2 "Rake bootstrap..." - /opt/jruby/bin/rake bootstrap - - msg2 "Rake plugin:install-default..." - /opt/jruby/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@.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 309755, logstash/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-03-21 00:21:51 UTC (rev 309756) @@ -0,0 +1,77 @@ +# $Id$ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgname=logstash +pkgver=6.2.3 +pkgrel=1 +pkgdesc='Tool for managing events and logs' +url='https://www.elastic.co/products/logstash/' +arch=('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' 'jruby') +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@.service + logstash-sysuser.conf + logstash-tmpfile.conf + bundle.config) +sha256sums=('5a69f9410afeadb5391efb0e72f4490569aa6446ce6f240aa95456230590c251' + '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c' + 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876' + '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26' + '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533' + 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1') +sha512sums=('ea0614406de451e315ab9755db4e32ee2ef409795353abb989afd104ee0cabcb543a22b7107fcbbfa5e74025effaccb2177a4a1aaed3e55704a70307b85f683e' + '817097565519dc7c5eac7521339947c74c6148683ca594356dd2ceb3274a1e94f8e7318ce310e0fe5789d7ab0d4c23404f814bef31036a11ddfec08d16814c69' + 'ce2cef4a784845b00d7c867273555811450bc459669abb5be944bfbbb02708129983e45376a9b308d6db22b2c7b4a7a212827a4826f2a27bc7e143cebc9abfe0' + 'd811dc3b18d0032b79b4669c9f6aefca49963897c309d83cbf87616c7b8cb5944c17c8072980bcd115d0fb57ef1624d98259ff1082d402d308c33e766ee89699' + '05ea8af97c4f6ac9ba5518b99dc3136859edd24d8376940b48b8c7a70586c8bc188deb1079a99e19d437c39e0eb17d68e7cc3f9af4aa3ad2bc6a87c08cae94a6' + '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} + + export JAVA_HOME=/usr/lib/jvm/java-8-openjdk + msg2 "Rake bootstrap..." + /opt/jruby/bin/rake bootstrap + + msg2 "Rake plugin:install-default..." + /opt/jruby/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@.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: bundle.config =================================================================== --- bundle.config 2018-03-21 00:21:26 UTC (rev 309755) +++ bundle.config 2018-03-21 00:21:51 UTC (rev 309756) @@ -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 309755, logstash/trunk/bundle.config) =================================================================== --- bundle.config (rev 0) +++ bundle.config 2018-03-21 00:21:51 UTC (rev 309756) @@ -0,0 +1,4 @@ +--- +BUNDLE_PATH: /usr/share/logstash/vendor/bundle +BUNDLE_WITHOUT: build:development +BUNDLE_GEMFILE: /usr/share/logstash/Gemfile Deleted: logstash-sysuser.conf =================================================================== --- logstash-sysuser.conf 2018-03-21 00:21:26 UTC (rev 309755) +++ logstash-sysuser.conf 2018-03-21 00:21:51 UTC (rev 309756) @@ -1 +0,0 @@ -u logstash - "Logstash user" /var/lib/logstash Copied: logstash/repos/community-x86_64/logstash-sysuser.conf (from rev 309755, logstash/trunk/logstash-sysuser.conf) =================================================================== --- logstash-sysuser.conf (rev 0) +++ logstash-sysuser.conf 2018-03-21 00:21:51 UTC (rev 309756) @@ -0,0 +1 @@ +u logstash - "Logstash user" /var/lib/logstash Deleted: logstash-tmpfile.conf =================================================================== --- logstash-tmpfile.conf 2018-03-21 00:21:26 UTC (rev 309755) +++ logstash-tmpfile.conf 2018-03-21 00:21:51 UTC (rev 309756) @@ -1,6 +0,0 @@ -d /var/log/logstash 0755 logstash logstash - -d /var/lib/logstash 0755 logstash logstash - -d /usr/share/logstash 0755 logstash logstash - -Z /usr/share/logstash - logstash logstash - - -d /etc/logstash 0750 logstash logstash - Copied: logstash/repos/community-x86_64/logstash-tmpfile.conf (from rev 309755, logstash/trunk/logstash-tmpfile.conf) =================================================================== --- logstash-tmpfile.conf (rev 0) +++ logstash-tmpfile.conf 2018-03-21 00:21:51 UTC (rev 309756) @@ -0,0 +1,6 @@ +d /var/log/logstash 0755 logstash logstash - +d /var/lib/logstash 0755 logstash logstash - +d /usr/share/logstash 0755 logstash logstash - +Z /usr/share/logstash - logstash logstash - + +d /etc/logstash 0750 logstash logstash - Deleted: logstash.service =================================================================== --- logstash.service 2018-03-21 00:21:26 UTC (rev 309755) +++ logstash.service 2018-03-21 00:21:51 UTC (rev 309756) @@ -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 309755, logstash/trunk/logstash.service) =================================================================== --- logstash.service (rev 0) +++ logstash.service 2018-03-21 00:21:51 UTC (rev 309756) @@ -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: logstash@.service =================================================================== --- logstash@.service 2018-03-21 00:21:26 UTC (rev 309755) +++ logstash@.service 2018-03-21 00:21:51 UTC (rev 309756) @@ -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@.service (from rev 309755, logstash/trunk/logstash@.service) =================================================================== --- logstash@.service (rev 0) +++ logstash@.service 2018-03-21 00:21:51 UTC (rev 309756) @@ -0,0 +1,7 @@ +.include /usr/lib/systemd/system/logstash.service + +[Unit] +Description=logstash (%I) + +[Service] +Environment=LOGSTASH_CONF=/etc/logstash/%I.conf