diff options
| author | Tyler Langlois | 2015-08-29 23:35:16 -0400 |
|---|---|---|
| committer | Tyler Langlois | 2015-08-29 23:35:16 -0400 |
| commit | d0bc9a1571947450feda4df689cb4568b1547fbe (patch) | |
| tree | 7c1a18559ca1857554511ab8c7ffc4d0427e0f18 | |
| parent | b31d775f16ad03196e73cd6ce9b489b291dc763a (diff) | |
| download | aur-d0bc9a1571947450feda4df689cb4568b1547fbe.tar.gz | |
riemann: various fixes
- Remove user home directory, /usr/share/riemann isn't used
- Fix broken directory set expansion in `install` lines
- Add 143 as valid systemd exit code
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | riemann.install | 3 | ||||
| -rw-r--r-- | riemann.service | 1 | ||||
| -rw-r--r-- | riemann.sysusers | 2 |
4 files changed, 9 insertions, 6 deletions
@@ -18,9 +18,9 @@ source=("https://aphyr.com/riemann/$pkgname-$pkgver.tar.bz2" backup=('etc/riemann/riemann.config') sha256sums=('f5bb666acb878e144471f8c6d7f622193840d127aea96924fd8575e1fb6c57dc' '0e1a10f59cc95f9cef3eb54cc9764366a714eec2ed6c08750ac13c5d456d69c5' - '4e7164386c91a3edf746ae0bba3d5e4e7ee24fa2093fe16d1da3d2b049cd2485' - '54489dda6703afcfeb2e209f4a5abdbddbad66f3ad78c5bae905706f346aca5d' - '58d35d4f6a488bbcf495f77449199dc7a498a67aacf8c789329bea69f532ad21') + 'd8f7789e9166b5d2472a444dffe8ffb01eb43fac366544b0082ceead2f01f20c' + '18e21c05c351a8bcbd55b3a454bceb67b7dcfe1385e7cca6936fe63640c44303' + '94181e635ae9774a76bf4169064f253b626fb09806694d34774ed06d54df35b8') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -36,7 +36,8 @@ prepare() { package() { cd "$srcdir/$pkgname-$pkgver" - install -dm755 "$pkgdir/var/{lib,log}/riemann" + install -dm755 "$pkgdir/var/log/riemann" + install -dm755 "$pkgdir/var/lib/riemann" install -Dm644 etc/riemann.config "$pkgdir/etc/riemann/riemann.config" install -Dm755 bin/riemann "$pkgdir/usr/bin/riemann" diff --git a/riemann.install b/riemann.install index a5015053d118..8dea6a48607d 100644 --- a/riemann.install +++ b/riemann.install @@ -1,6 +1,7 @@ post_install() { systemd-sysusers riemann.conf - install -d -o riemann -g riemann /var/{lib,log}/riemann + install -d -o riemann -g riemann /var/log/riemann + install -d -o riemann -g riemann /var/lib/riemann } post_remove() { diff --git a/riemann.service b/riemann.service index 07a91b44c21e..484fd8fbf8fe 100644 --- a/riemann.service +++ b/riemann.service @@ -5,6 +5,7 @@ After=network.target [Service] User=riemann ExecStart=/usr/bin/riemann /etc/riemann/riemann.config +SuccessExitStatus=143 [Install] WantedBy=multi-user.target diff --git a/riemann.sysusers b/riemann.sysusers index a6cbd1bf7150..4a450285230b 100644 --- a/riemann.sysusers +++ b/riemann.sysusers @@ -1 +1 @@ -u riemann - - /usr/share/riemann +u riemann |