merge: master <--- feature/v16.1.4-2

* HEAD
| \
| * 1dc1e82 <github@luxolus.com> pkgbuild: pkgrel=2
| * 5156bc8 <github@luxolus.com> pkgbuild: fixes to package(), install LICENSE
| /
| master

Signed-off-by: Bazaah <github@luxolus.com>
This commit is contained in:
Paul Stemmet 2024-02-11 18:50:03 +00:00
commit 987d9e11db
Signed by: Paul Stemmet
GPG Key ID: EDEA539F594E7E75
2 changed files with 14 additions and 9 deletions

View File

@ -1,7 +1,7 @@
pkgbase = open-consul pkgbase = open-consul
pkgdesc = A tool for service discovery, monitoring and configuration. pkgdesc = A tool for service discovery, monitoring and configuration.
pkgver = 1.16.4 pkgver = 1.16.4
pkgrel = 1 pkgrel = 2
url = https://developer.hashicorp.com/consul/docs/v1.16.x url = https://developer.hashicorp.com/consul/docs/v1.16.x
install = consul.install install = consul.install
arch = x86_64 arch = x86_64

View File

@ -6,7 +6,7 @@
pkgname=open-consul pkgname=open-consul
_commit=25957a17b5eddd1b95ebda13f8a667ec3c02b4c6 _commit=25957a17b5eddd1b95ebda13f8a667ec3c02b4c6
pkgver=1.16.4 pkgver=1.16.4
pkgrel=1 pkgrel=2
pkgdesc="A tool for service discovery, monitoring and configuration." pkgdesc="A tool for service discovery, monitoring and configuration."
provides=('consul') provides=('consul')
conflicts=('consul') conflicts=('consul')
@ -68,15 +68,20 @@ check() {
package() { package() {
cd "${srcdir}/${pkgname}" cd "${srcdir}/${pkgname}"
install -D -d -m750 -o 208 -g 208 "${pkgdir}/var/lib/consul" # dirs
install -D -d -m750 -o 0 -g 208 "${pkgdir}/etc/consul.d" install -D -m750 -o 208 -g 208 -d "${pkgdir}/var/lib/consul"
install -D -m755 -o 0 -g 208 -d "${pkgdir}/etc/consul.d"
# configuration
install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul" install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul"
install -D -m644 -o 0 -g 0 "${srcdir}/example.json" "${pkgdir}/usr/share/doc/consul/config.example.json" install -D -m644 "${srcdir}/example.json" "${pkgdir}/usr/share/doc/${pkgname}/config.example.json"
install -Dm755 "build/consul" "${pkgdir}/usr/bin/consul" install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
install -Dm644 "${srcdir}/consul.service" "${pkgdir}/usr/lib/systemd/system/consul.service" install -D -m644 "${srcdir}/consul.service" "${pkgdir}/usr/lib/systemd/system/consul.service"
install -Dm644 "${srcdir}/consul.sysusers" "${pkgdir}/usr/lib/sysusers.d/consul.conf" install -D -m644 "${srcdir}/consul.sysusers" "${pkgdir}/usr/lib/sysusers.d/consul.conf"
# binaries
install -Dm755 "build/consul" "${pkgdir}/usr/bin/consul"
} }
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et: