diff options
-rw-r--r-- | pcr/icinga/PKGBUILD | 38 | ||||
-rw-r--r-- | pcr/icinga/icinga.install | 4 | ||||
-rw-r--r-- | pcr/icinga/icinga.sysusers | 4 |
3 files changed, 23 insertions, 23 deletions
diff --git a/pcr/icinga/PKGBUILD b/pcr/icinga/PKGBUILD index 9994c0401..f114137e7 100644 --- a/pcr/icinga/PKGBUILD +++ b/pcr/icinga/PKGBUILD @@ -1,39 +1,34 @@ -# Maintainer (Arch): Foppe Hemminga <foppe@hemminga.net> -# Contributer (Arch): ralix <ralix@gmx.de> -# Contributer (Arch): GutenYe <ywzhaifei@gmail.com> +# Maintainer (AUR): Foppe Hemminga <foppe@hemminga.net> +# Contributer (AUR): ralix <ralix@gmx.de> +# Contributer (AUR): GutenYe <ywzhaifei@gmail.com> + +# parabola changes and rationale: +# - removed "open source" term from pkgdesc +# - moved user creation to a sysusers.d file pkgname=icinga -pkgver=1.13.2 +pkgver=1.13.3 pkgrel=1 pkgdesc="A libre host, service and network monitoring program." license=('GPL') -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv7h') url="http://www.icinga.org" depends=('gd' 'freetype2' 'libtool' 'libdbi-drivers' 'openssl') optdepends=('monitoring-plugins: plugins needed for icinga checks') source=("https://github.com/Icinga/icinga-core/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" - "icinga.install") + "icinga.install" + "icinga.sysusers") -md5sums=('2a576e2391ce56426f3924c4053491e2' - '57e5cdb21a148e55cb5ddb55e6e8812d') +md5sums=('9a74a5e7217c0fb9aea3a66cc11d2aa5' + '736983ed80825d74530ce5fc28151e2d' + '4887d2a1c82098facb3d65e487145915') install='icinga.install' -_icinga_user="icinga" -_icinga_group="icinga" +_icinga_user="667" +_icinga_group="667" build() { - if [ -z $(getent group _icinga_group) -a $(getent passwd _icinga_user) ] - then - cat << DOC ---> This script requires user icinga:icinga to exist ---> You can use the following commands to do create this user: -# groupadd -g 667 icinga -# useradd -u 667 -g icinga -G http -d /dev/null -s /bin/false icinga -DOC - exit - fi - cd "$srcdir/$pkgname-$pkgver" ### @@ -85,6 +80,7 @@ package() { install -Dm644 icinga-systemd "$pkgdir/usr/lib/systemd/system/icinga.service" install -Dm644 ido2db-systemd "$pkgdir/usr/lib/systemd/system/ido2db.service" install -Dm644 sysconfig-env "$pkgdir/etc/sysconfig/icinga" + install -Dm644 ../icinga.sysusers "${pkgdir}"/usr/lib/sysusers.d/icinga.conf install -dm755 "$pkgdir/usr/share/icinga/idoutils" cp -r module/idoutils/db "$pkgdir/usr/share/icinga/idoutils" diff --git a/pcr/icinga/icinga.install b/pcr/icinga/icinga.install index 5799254e9..eed0df9ea 100644 --- a/pcr/icinga/icinga.install +++ b/pcr/icinga/icinga.install @@ -16,7 +16,7 @@ EOM post_remove() { - userdel icinga - groupdel icinga +# userdel icinga +# groupdel icinga } diff --git a/pcr/icinga/icinga.sysusers b/pcr/icinga/icinga.sysusers new file mode 100644 index 000000000..f75dc3d53 --- /dev/null +++ b/pcr/icinga/icinga.sysusers @@ -0,0 +1,4 @@ +g icinga 667 "icinga group" +u icinga 667 "icinga user" /var/empty +m icinga icinga +m icinga http |