diff options
| author | Julian Brost | 2018-02-24 20:43:18 +0100 |
|---|---|---|
| committer | Julian Brost | 2018-02-24 22:04:04 +0100 |
| commit | 888ef0ad133ed138f8ca446be63eb709d8cfd11c (patch) | |
| tree | e7c1bb4ac36bc089d0d580a9e74a1f3a2526ab7f | |
| parent | 5bb2d7f790136a3c1064d00ef55ff662b4208938 (diff) | |
| download | aur-888ef0ad133ed138f8ca446be63eb709d8cfd11c.tar.gz | |
move tmpfiles.conf to separate file
Also remove unnecessary call to systemd-tempfiles in post_install: this
is now automatically done by a pacman hook.
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | icinga2-git.install | 2 | ||||
| -rw-r--r-- | icinga2-git.tmpfiles | 2 |
3 files changed, 7 insertions, 9 deletions
@@ -42,8 +42,10 @@ backup=(etc/default/icinga2 etc/icinga2/zones.conf etc/logrotate.d/icinga2) install='icinga2-git.install' -source=('git+https://github.com/Icinga/icinga2.git') -sha256sums=('SKIP') +source=('git+https://github.com/Icinga/icinga2.git' + "$pkgname.tmpfiles") +sha256sums=('SKIP' + '1302b333f49ead14f8808a379535971501d3a0c1ba02a7bf7b4406b7d27c754c') pkgver() { cd "$_pkgname" @@ -81,11 +83,7 @@ package() { rm "$pkgdir/etc/icinga2/features-enabled/notification.conf" rm -r "$pkgdir/run" - mkdir -p "$pkgdir/usr/lib/tmpfiles.d" - cat > "$pkgdir/usr/lib/tmpfiles.d/icinga2.conf" <<- EOF - d /run/icinga2 0750 icinga icingacmd - - d /run/icinga2/cmd 2750 icinga icingacmd - - EOF + install -Dm644 "$srcdir/$pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" cd "$srcdir/$_pkgname" diff --git a/icinga2-git.install b/icinga2-git.install index 5416cfd14911..4dc007ac9fc1 100644 --- a/icinga2-git.install +++ b/icinga2-git.install @@ -12,8 +12,6 @@ post_install() { /var/cache/icinga2 \ /var/log/icinga2 - /usr/bin/systemd-tmpfiles --create icinga2.conf - /usr/bin/icinga2 feature enable checker &> /dev/null /usr/bin/icinga2 feature enable mainlog &> /dev/null /usr/bin/icinga2 feature enable notification &> /dev/null diff --git a/icinga2-git.tmpfiles b/icinga2-git.tmpfiles new file mode 100644 index 000000000000..d6fe4766c00f --- /dev/null +++ b/icinga2-git.tmpfiles @@ -0,0 +1,2 @@ +d /run/icinga2 0750 icinga icingacmd - +d /run/icinga2/cmd 2750 icinga icingacmd - |