From 7a2ef39dcd741ef0674338e425e2ab058010ac55 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 30 Jul 2016 07:05:47 +0200 Subject: [PATCH] icinga2: multiple misc fixes. - fix INSTALL script. - remove /etc/init.d. - remove useless _groups. - remove redundant configure args. - misc tweaks. --- srcpkgs/icinga2/INSTALL | 10 +++++++--- srcpkgs/icinga2/template | 11 +++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/srcpkgs/icinga2/INSTALL b/srcpkgs/icinga2/INSTALL index 9fd1fdbcdc6..58b3992d57c 100644 --- a/srcpkgs/icinga2/INSTALL +++ b/srcpkgs/icinga2/INSTALL @@ -1,3 +1,7 @@ - chown icinga:icinga -R /etc/icinga2; - install -gicinga -oicinga -d /var/log/icinga2 - install -gicinga -oicinga -d /var/lib/icinga2 +case "$ACTION" in +post) + chown -R icinga:icinga etc/icinga2 + install -gicinga -oicinga -d var/log/icinga2 + install -gicinga -oicinga -d var/lib/icinga2 + ;; +esac diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index 91087d3f72f..8356e8e2d9e 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -1,14 +1,14 @@ # Template file for 'icinga2' pkgname=icinga2 version=2.4.10 -revision=1 -short_desc="Icinga is a scalable and extensible monitoring system" -nocross=yes +revision=2 build_style=cmake -configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DICINGA2_RUNDIR=/run -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/" +configure_args="-DICINGA2_RUNDIR=/run -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/" hostmakedepends="flex git" makedepends="libressl-devel boost-devel yajl-devel libmysqlclient-devel libedit-devel postgresql-libs-devel" depends="monitoring-plugins" +conf_files="/etc/$pkgname/*.conf /etc/$pkgname/conf.d/*.conf /etc/$pkgname/features-enabled/*.conf" +short_desc="A scalable and extensible monitoring system" maintainer="Corné Oppelaar " license="GPL-2" homepage="https://www.icinga.org/" @@ -18,10 +18,9 @@ checksum="c2963430503c382cc4d5083b05731c0b965b5ffa960e900c0827b83789f0425e" system_accounts="icinga" system_groups="icingacmd" icinga_pgroup="icingacmd" -icinga_groups="icinga" post_install() { vsv icinga2 # remove useless files - rm -rf "${DESTDIR}/etc/sysconfig" + rm -rf ${DESTDIR}/etc/{init.d,sysconfig} }