diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 16 | ||||
-rw-r--r-- | logstash.install | 4 | ||||
-rw-r--r-- | logstash.service | 1 |
4 files changed, 18 insertions, 9 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Nov 21 10:03:09 UTC 2016 +# Mon Nov 28 09:33:49 UTC 2016 pkgbase = logstash pkgdesc = A tool for managing events and logs pkgver = 5.0.1 - pkgrel = 2 + pkgrel = 3 url = https://www.elastic.co/products/logstash install = logstash.install arch = any @@ -15,7 +15,7 @@ pkgbase = logstash source = user.conf source = bundle.config sha256sums = d4cb9a624e12f8e4cf852a251c96b371094009b84a85231c9604ba7d6523da4d - sha256sums = 5d104679e730589d8822a0296ef921c34b8328761d2c5378429c1a65c529938a + sha256sums = 456ac4cb956c53512201a257dc9a4603a5ac4d317c2f02c7da5cd68060c0fee6 sha256sums = a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876 sha256sums = f1dc558bcb50893fe744b9c3ba208829db9e242a83d30493795f837c05f5d89c sha256sums = fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1 @@ -2,7 +2,7 @@ pkgname=logstash pkgver=5.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='A tool for managing events and logs' arch=('any') url='https://www.elastic.co/products/logstash' @@ -16,7 +16,7 @@ source=("https://artifacts.elastic.co/downloads/$pkgname/$pkgname-$pkgver.tar.gz "user.conf" "bundle.config") sha256sums=('d4cb9a624e12f8e4cf852a251c96b371094009b84a85231c9604ba7d6523da4d' - '5d104679e730589d8822a0296ef921c34b8328761d2c5378429c1a65c529938a' + '456ac4cb956c53512201a257dc9a4603a5ac4d317c2f02c7da5cd68060c0fee6' 'a01ea29d4f53d785f6eb926ebfe445e64ed5b3dab5d0418848589dd79502d876' 'f1dc558bcb50893fe744b9c3ba208829db9e242a83d30493795f837c05f5d89c' 'fe05315345e4489458c3eecac43726800109c1e390e74a14584096f6c041fee1') @@ -25,8 +25,10 @@ prepare() { cd "$srcdir"/$pkgname-$pkgver rm -f bin/logstash.bat + sed -e 's|LS_SETTINGS_DIR=.*|LS_SETTINGS_DIR="/etc/logstash/config"|' \ + -i config/startup.options + sed -e '1i [ -f /etc/profile.d/jre.sh ] && . /etc/profile.d/jre.sh' \ - -e '2i [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh' \ -i bin/logstash.lib.sh cd vendor/jruby/lib/jni @@ -36,9 +38,14 @@ prepare() { package() { cd "$srcdir" - install -dm755 "$pkgdir"/usr/share + install -dm755 "$pkgdir"/usr/share "$pkgdir"/etc/conf.d cp -a logstash-$pkgver "$pkgdir"/usr/share/logstash + cd "$pkgdir"/usr/share/logstash + mv config/startup.options "$pkgdir"/etc/conf.d/logstash + mv config "$pkgdir"/etc/logstash + + cd "$srcdir" install -Dm644 logstash.service "$pkgdir"/usr/lib/systemd/system/logstash.service install -Dm644 logstash@.service "$pkgdir"/usr/lib/systemd/system/logstash@.service install -Dm644 user.conf "$pkgdir"/usr/lib/sysusers.d/logstash.conf @@ -46,5 +53,6 @@ package() { install -Dm644 bundle.config "$pkgdir"/usr/share/logstash/.bundle/config install -dm755 "$pkgdir"/var/lib/logstash + install -dm755 "$pkgdir"/var/log/logstash install -dm755 "$pkgdir"/etc/logstash/conf.d } diff --git a/logstash.install b/logstash.install index cbc462be6685..8d8dcb6b0913 100644 --- a/logstash.install +++ b/logstash.install @@ -1,9 +1,9 @@ post_install() { systemd-sysusers logstash.conf - chown -R logstash:logstash usr/share/logstash var/lib/logstash + chown -R logstash:logstash usr/share/logstash var/lib/logstash var/log/logstash } post_upgrade() { systemd-sysusers logstash.conf - chown -R logstash:logstash usr/share/logstash + chown -R logstash:logstash usr/share/logstash var/log/logstash } diff --git a/logstash.service b/logstash.service index 134ab51d8688..69e2e231a088 100644 --- a/logstash.service +++ b/logstash.service @@ -7,6 +7,7 @@ Type=simple User=logstash Group=logstash Environment=LOGSTASH_CONF=/etc/logstash/ +EnvironmentFile=-/etc/conf.d/logstash ExecStart=/usr/share/logstash/bin/logstash "--path.settings" "$LOGSTASH_CONF" Restart=on-failure WorkingDirectory=/ |