Date: Wednesday, December 11, 2019 @ 20:33:21 Author: mtorromeo Revision: 536943
archrelease: copy trunk to community-x86_64 Added: logstash/repos/community-x86_64/PKGBUILD (from rev 536942, logstash/trunk/PKGBUILD) logstash/repos/community-x86_64/build.patch (from rev 536942, logstash/trunk/build.patch) logstash/repos/community-x86_64/bundle.config (from rev 536942, logstash/trunk/bundle.config) logstash/repos/community-x86_64/logstash-sysuser.conf (from rev 536942, logstash/trunk/logstash-sysuser.conf) logstash/repos/community-x86_64/logstash-tmpfile.conf (from rev 536942, logstash/trunk/logstash-tmpfile.conf) logstash/repos/community-x86_64/logstash.service (from rev 536942, logstash/trunk/logstash.service) logstash/repos/community-x86_64/logstash@.service (from rev 536942, logstash/trunk/logstash@.service) Deleted: logstash/repos/community-x86_64/PKGBUILD logstash/repos/community-x86_64/build.patch 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 | 222 ++++++++++++++++++++++++------------------------ build.patch | 144 +++++++++++++++---------------- bundle.config | 8 - logstash-sysuser.conf | 2 logstash-tmpfile.conf | 12 +- logstash.service | 46 ++++----- logstash@.service | 14 +-- 7 files changed, 224 insertions(+), 224 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-12-11 20:33:05 UTC (rev 536942) +++ PKGBUILD 2019-12-11 20:33:21 UTC (rev 536943) @@ -1,111 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> - -pkgname=logstash -pkgver=7.4.2 -_jrubyver=9.2.7.0 -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' 'coreutils' 'awk') -makedepends=('java-environment<11' 'git') -backup=('etc/conf.d/logstash' - 'etc/logstash/jvm.options' - 'etc/logstash/log4j2.properties' - 'etc/logstash/logstash.yml' - 'etc/logstash/pipelines.yml') -_jrubydist=jruby-dist-${_jrubyver}-bin.tar.gz -source=(https://github.com/elastic/logstash/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz - https://repo1.maven.org/maven2/org/jruby/jruby-dist/${_jrubyver}/${_jrubydist} - build.patch - logstash.service - logstash@.service - logstash-sysuser.conf - logstash-tmpfile.conf - bundle.config) -noextract=(${_jrubydist}) -sha256sums=('38e172e7823a5e68b24c4b974f2bd92cae88a9410f19ada643e4340a3558faa1' - 'da7c1a5ce90015c0bafd4bca0352294e08fe1c9ec049ac51e82fe57ed50e1348' - '9ae56b463b465f16363f60670c7da4e84a9bf03c17324c4364c089d7a480cb4b' - '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c' - 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876' - '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26' - '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533' - 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1') -sha512sums=('a7017e1169e1c1f01ea414aba7c21f52aafebb702fba3711c1419b92b518bf07e3c2a0f339a6b366a918268531a83ac748e28dc009b9a855827f54d05bad3e20' - '8e71e27fdb149cb7470fb736e7ce858719d13ce6ff8a1e9ab1c1dc71fcc068fb601946bb28ed2feee3670b5e6ebfa8a655a6618d1badfc3763897912c41b1c82' - 'f6ddf9cc70a2c0cabaacf39fa26953c15af0060711713b2de69caddd2b8f845edde535f002cd7a0d0f8fc01abf934d887278fb6617b2a3d640284bc16ea34927' - '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 - - # remove deprecated JVM options - sed 's|"-XX:+UseParNewGC", ||g' -i logstash-core/benchmarks/build.gradle - sed 's|-XX:+UseParNewGC||g' -i config/jvm.options - - # patch -p1 -i "$srcdir"/build.patch - - # Use system gradle (currently not working) - # sed 's;./gradlew;gradle;g' -i rakelib/*.rake - - # Skip downloadAndInstallJRuby task in the bootstrap process - sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake - - mkdir -p vendor/_/ - cd vendor/_/ - ln -s "$srcdir"/${_jrubydist} -} - -build() { - cd ${pkgname}-${pkgver} - export PATH="/usr/lib/jvm/java-10-openjdk/bin:$PWD/vendor/jruby/bin:$PATH" - - # gradle -x :logstash-core:javadoc bootstrap (system gradle currently not working) - RELEASE=1 OSS=1 ./gradlew -x :logstash-core:javadoc installDefaultGems - - rm -r build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools .gradle \ - vendor/_ vendor/bundle/jruby/*/cache vendor/jruby/lib/ruby/gems/shared/cache - - cd vendor/jruby/lib - mv jni jni-temp - mkdir jni - mv jni-temp/x86_64-Linux jni/ - rm -rf jni-temp -} - -package() { - cd ${pkgname}-${pkgver} - - install -dm 755 "${pkgdir}/usr/share/logstash" "${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 bin data lib logstash* modules vendor Gemfile* "${pkgdir}/usr/share/logstash" - rm -rf "${pkgdir}/usr/share/logstash/logstash-core/"{.lock,benchmarks,*gradle*} - chmod -R go-w "${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" - - install -d "${pkgdir}/usr/bin" - ln -s /usr/share/logstash/bin/logstash "${pkgdir}/usr/bin/logstash" -} - -# vim: ts=2 sw=2 et: Copied: logstash/repos/community-x86_64/PKGBUILD (from rev 536942, logstash/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-12-11 20:33:21 UTC (rev 536943) @@ -0,0 +1,111 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> + +pkgname=logstash +pkgver=7.5.0 +_jrubyver=9.2.7.0 +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' 'coreutils' 'awk') +makedepends=('java-environment<11' 'git') +backup=('etc/conf.d/logstash' + 'etc/logstash/jvm.options' + 'etc/logstash/log4j2.properties' + 'etc/logstash/logstash.yml' + 'etc/logstash/pipelines.yml') +_jrubydist=jruby-dist-${_jrubyver}-bin.tar.gz +source=(https://github.com/elastic/logstash/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz + https://repo1.maven.org/maven2/org/jruby/jruby-dist/${_jrubyver}/${_jrubydist} + build.patch + logstash.service + logstash@.service + logstash-sysuser.conf + logstash-tmpfile.conf + bundle.config) +noextract=(${_jrubydist}) +sha256sums=('38e240b8c707ef2866e44af0c133a33787909123e02997f52e8502e442766e85' + 'da7c1a5ce90015c0bafd4bca0352294e08fe1c9ec049ac51e82fe57ed50e1348' + '9ae56b463b465f16363f60670c7da4e84a9bf03c17324c4364c089d7a480cb4b' + '2b8b29297202334c784fdd7f2eb8d7e776c24c783b3c9f8387b500ab0039335c' + 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876' + '18a68a59ddb0ce19778e83b65e68dd568d65b7180bf45b4cf298fb332d69eb26' + '346b630484f8a35b1a549e94e53e3e151527852a29c72cc6e529221215a7f533' + 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1') +sha512sums=('cd1c577fb2becd22b49ff070d0ad01d08f637b01f1fcbd289d608c1a3682bc4925e8f7554223f641e84671d71ba4421dd0504ec5fbd15a3812277a186c253729' + '8e71e27fdb149cb7470fb736e7ce858719d13ce6ff8a1e9ab1c1dc71fcc068fb601946bb28ed2feee3670b5e6ebfa8a655a6618d1badfc3763897912c41b1c82' + 'f6ddf9cc70a2c0cabaacf39fa26953c15af0060711713b2de69caddd2b8f845edde535f002cd7a0d0f8fc01abf934d887278fb6617b2a3d640284bc16ea34927' + '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 + + # remove deprecated JVM options + sed 's|"-XX:+UseParNewGC", ||g' -i logstash-core/benchmarks/build.gradle + sed 's|-XX:+UseParNewGC||g' -i config/jvm.options + + # patch -p1 -i "$srcdir"/build.patch + + # Use system gradle (currently not working) + # sed 's;./gradlew;gradle;g' -i rakelib/*.rake + + # Skip downloadAndInstallJRuby task in the bootstrap process + sed /downloadAndInstallJRuby/d -i rakelib/vendor.rake + + mkdir -p vendor/_/ + cd vendor/_/ + ln -s "$srcdir"/${_jrubydist} +} + +build() { + cd ${pkgname}-${pkgver} + export PATH="/usr/lib/jvm/java-10-openjdk/bin:$PWD/vendor/jruby/bin:$PATH" + + # gradle -x :logstash-core:javadoc bootstrap (system gradle currently not working) + RELEASE=1 OSS=1 ./gradlew -x :logstash-core:javadoc installDefaultGems + + rm -r build ci logstash-core/{build,src,spec} qa pkg spec rakelib tools .gradle \ + vendor/_ vendor/bundle/jruby/*/cache vendor/jruby/lib/ruby/gems/shared/cache + + cd vendor/jruby/lib + mv jni jni-temp + mkdir jni + mv jni-temp/x86_64-Linux jni/ + rm -rf jni-temp +} + +package() { + cd ${pkgname}-${pkgver} + + install -dm 755 "${pkgdir}/usr/share/logstash" "${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 bin data lib logstash* modules vendor Gemfile* "${pkgdir}/usr/share/logstash" + rm -rf "${pkgdir}/usr/share/logstash/logstash-core/"{.lock,benchmarks,*gradle*} + chmod -R go-w "${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" + + install -d "${pkgdir}/usr/bin" + ln -s /usr/share/logstash/bin/logstash "${pkgdir}/usr/bin/logstash" +} + +# vim: ts=2 sw=2 et: Deleted: build.patch =================================================================== --- build.patch 2019-12-11 20:33:05 UTC (rev 536942) +++ build.patch 2019-12-11 20:33:21 UTC (rev 536943) @@ -1,72 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 5b2275e..67312d6 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -111,7 +111,6 @@ def isReleaseBuild = System.getenv('RELEASE') == "1" || versionQualifier - clean { - delete "${projectDir}/Gemfile" - delete "${projectDir}/Gemfile.lock" -- delete "${projectDir}/vendor" - delete "${projectDir}/.bundle" - delete "${projectDir}/qa/integration/Gemfile.lock" - delete "${projectDir}/qa/integration/.bundle" -@@ -346,7 +345,7 @@ task downloadEs(type: Download) { - // in the normal PR type builds it is plain '7.0.0' - // in the build invoked by the release manager it is '7.0.0-alpha1' etc. - // the artifacts-api will return JSON like this: `{"versions":["5.6.13-SNAPSHOT","6.4.3-SNAPSHOT","6.5.0-SNAPSHOT","6.6.0-SNAPSHOT","7.0.0-alpha1-SNAPSHOT"]}` -- -+ - String qualifiedVersion = dlVersions['versions'].grep(isReleaseBuild ? ~/^${version}$/ : ~/^${version}-SNAPSHOT/)[0] - - if (qualifiedVersion == null) { -diff --git a/rubyUtils.gradle b/rubyUtils.gradle -index 6f0eec4..08a35f6 100644 ---- a/rubyUtils.gradle -+++ b/rubyUtils.gradle -@@ -190,7 +190,7 @@ task downloadJRuby(type: Download) { - - downloadJRuby.onlyIf { customJRubyDir == "" } - --task verifyFile(dependsOn: downloadJRuby, type: Verify) { -+task verifyFile(type: Verify) { - description "Verify the SHA1 of the download JRuby artifact" - inputs.file(jrubyTarPath) - outputs.file(jrubyTarPath) -@@ -202,36 +202,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) { - verifyFile.onlyIf { customJRubyDir == "" } - verifyFile.onlyIf { doChecksum } - --task buildCustomJRuby(type: Exec) { -- description "Build tar.gz and .jar artifacts from JRuby source directory" -- workingDir (customJRubyDir == "" ? "./" : customJRubyDir) -- commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete' -- standardOutput = new ByteArrayOutputStream() -- errorOutput = new ByteArrayOutputStream() -- ext.output = { -- standardOutput.toString() + errorOutput.toString() -- } --} -- --buildCustomJRuby.onlyIf { customJRubyDir != "" } -- --task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) { -- description "Install custom built JRuby in the vendor directory" -- inputs.file(customJRubyTar) -- outputs.dir("${projectDir}/vendor/jruby") -- from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar) -- eachFile { f -> -- f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '') -- } -- exclude "**/stdlib/rdoc/**" -- includeEmptyDirs = false -- into "${projectDir}/vendor/jruby" --} -- --installCustomJRuby.onlyIf { customJRubyDir != "" } -- -- --task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) { -+task downloadAndInstallJRuby(dependsOn: [verifyFile], type: Copy) { - description "Install JRuby in the vendor directory" - inputs.file(jrubyTarPath) - outputs.dir("${projectDir}/vendor/jruby") Copied: logstash/repos/community-x86_64/build.patch (from rev 536942, logstash/trunk/build.patch) =================================================================== --- build.patch (rev 0) +++ build.patch 2019-12-11 20:33:21 UTC (rev 536943) @@ -0,0 +1,72 @@ +diff --git a/build.gradle b/build.gradle +index 5b2275e..67312d6 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -111,7 +111,6 @@ def isReleaseBuild = System.getenv('RELEASE') == "1" || versionQualifier + clean { + delete "${projectDir}/Gemfile" + delete "${projectDir}/Gemfile.lock" +- delete "${projectDir}/vendor" + delete "${projectDir}/.bundle" + delete "${projectDir}/qa/integration/Gemfile.lock" + delete "${projectDir}/qa/integration/.bundle" +@@ -346,7 +345,7 @@ task downloadEs(type: Download) { + // in the normal PR type builds it is plain '7.0.0' + // in the build invoked by the release manager it is '7.0.0-alpha1' etc. + // the artifacts-api will return JSON like this: `{"versions":["5.6.13-SNAPSHOT","6.4.3-SNAPSHOT","6.5.0-SNAPSHOT","6.6.0-SNAPSHOT","7.0.0-alpha1-SNAPSHOT"]}` +- ++ + String qualifiedVersion = dlVersions['versions'].grep(isReleaseBuild ? ~/^${version}$/ : ~/^${version}-SNAPSHOT/)[0] + + if (qualifiedVersion == null) { +diff --git a/rubyUtils.gradle b/rubyUtils.gradle +index 6f0eec4..08a35f6 100644 +--- a/rubyUtils.gradle ++++ b/rubyUtils.gradle +@@ -190,7 +190,7 @@ task downloadJRuby(type: Download) { + + downloadJRuby.onlyIf { customJRubyDir == "" } + +-task verifyFile(dependsOn: downloadJRuby, type: Verify) { ++task verifyFile(type: Verify) { + description "Verify the SHA1 of the download JRuby artifact" + inputs.file(jrubyTarPath) + outputs.file(jrubyTarPath) +@@ -202,36 +202,7 @@ task verifyFile(dependsOn: downloadJRuby, type: Verify) { + verifyFile.onlyIf { customJRubyDir == "" } + verifyFile.onlyIf { doChecksum } + +-task buildCustomJRuby(type: Exec) { +- description "Build tar.gz and .jar artifacts from JRuby source directory" +- workingDir (customJRubyDir == "" ? "./" : customJRubyDir) +- commandLine './mvnw', 'clean', 'install', '-Pdist', '-Pcomplete' +- standardOutput = new ByteArrayOutputStream() +- errorOutput = new ByteArrayOutputStream() +- ext.output = { +- standardOutput.toString() + errorOutput.toString() +- } +-} +- +-buildCustomJRuby.onlyIf { customJRubyDir != "" } +- +-task installCustomJRuby(dependsOn: buildCustomJRuby, type: Copy) { +- description "Install custom built JRuby in the vendor directory" +- inputs.file(customJRubyTar) +- outputs.dir("${projectDir}/vendor/jruby") +- from tarTree(customJRubyTar == "" ? jrubyTarPath : customJRubyTar) +- eachFile { f -> +- f.path = f.path.replaceFirst("^jruby-${customJRubyVersion}", '') +- } +- exclude "**/stdlib/rdoc/**" +- includeEmptyDirs = false +- into "${projectDir}/vendor/jruby" +-} +- +-installCustomJRuby.onlyIf { customJRubyDir != "" } +- +- +-task downloadAndInstallJRuby(dependsOn: [verifyFile, installCustomJRuby], type: Copy) { ++task downloadAndInstallJRuby(dependsOn: [verifyFile], type: Copy) { + description "Install JRuby in the vendor directory" + inputs.file(jrubyTarPath) + outputs.dir("${projectDir}/vendor/jruby") Deleted: bundle.config =================================================================== --- bundle.config 2019-12-11 20:33:05 UTC (rev 536942) +++ bundle.config 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 536942, logstash/trunk/bundle.config) =================================================================== --- bundle.config (rev 0) +++ bundle.config 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 2019-12-11 20:33:05 UTC (rev 536942) +++ logstash-sysuser.conf 2019-12-11 20:33:21 UTC (rev 536943) @@ -1 +0,0 @@ -u logstash - "Logstash user" /var/lib/logstash Copied: logstash/repos/community-x86_64/logstash-sysuser.conf (from rev 536942, logstash/trunk/logstash-sysuser.conf) =================================================================== --- logstash-sysuser.conf (rev 0) +++ logstash-sysuser.conf 2019-12-11 20:33:21 UTC (rev 536943) @@ -0,0 +1 @@ +u logstash - "Logstash user" /var/lib/logstash Deleted: logstash-tmpfile.conf =================================================================== --- logstash-tmpfile.conf 2019-12-11 20:33:05 UTC (rev 536942) +++ logstash-tmpfile.conf 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 536942, logstash/trunk/logstash-tmpfile.conf) =================================================================== --- logstash-tmpfile.conf (rev 0) +++ logstash-tmpfile.conf 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 2019-12-11 20:33:05 UTC (rev 536942) +++ logstash.service 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 536942, logstash/trunk/logstash.service) =================================================================== --- logstash.service (rev 0) +++ logstash.service 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 2019-12-11 20:33:05 UTC (rev 536942) +++ logstash@.service 2019-12-11 20:33:21 UTC (rev 536943) @@ -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 536942, logstash/trunk/logstash@.service) =================================================================== --- logstash@.service (rev 0) +++ logstash@.service 2019-12-11 20:33:21 UTC (rev 536943) @@ -0,0 +1,7 @@ +.include /usr/lib/systemd/system/logstash.service + +[Unit] +Description=logstash (%I) + +[Service] +Environment=LOGSTASH_CONF=/etc/logstash/%I.conf