summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2014-08-22 05:27:00 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2014-08-22 05:27:00 +0000
commit9d78737da62a1dc9a9f84843d6ff5e6609e7d330 (patch)
treec034ba8563d274c9f1cbb4a27eca21e047e2c856 /net-analyzer/icinga2
parentbup and possible fixes for bug 518814 and bug 520332 (diff)
downloadgentoo-2-9d78737da62a1dc9a9f84843d6ff5e6609e7d330.tar.gz
gentoo-2-9d78737da62a1dc9a9f84843d6ff5e6609e7d330.tar.bz2
gentoo-2-9d78737da62a1dc9a9f84843d6ff5e6609e7d330.zip
bup
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'net-analyzer/icinga2')
-rw-r--r--net-analyzer/icinga2/ChangeLog8
-rw-r--r--net-analyzer/icinga2/icinga2-2.0.2.ebuild (renamed from net-analyzer/icinga2/icinga2-2.0.0.ebuild)12
2 files changed, 14 insertions, 6 deletions
diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 1f362e5bc836..e2284f7aa123 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-analyzer/icinga2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.3 2014/07/17 03:05:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.4 2014/08/22 05:27:00 prometheanfire Exp $
+
+*icinga2-2.0.2 (22 Aug 2014)
+
+ 22 Aug 2014; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.0.2.ebuild,
+ -icinga2-2.0.0.ebuild:
+ bup
*icinga2-2.0.1 (17 Jul 2014)
diff --git a/net-analyzer/icinga2/icinga2-2.0.0.ebuild b/net-analyzer/icinga2/icinga2-2.0.2.ebuild
index f0ff4f6984d7..00066e1fe446 100644
--- a/net-analyzer/icinga2/icinga2-2.0.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.0.0.ebuild,v 1.1 2014/06/16 15:35:03 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.0.2.ebuild,v 1.1 2014/08/22 05:27:00 prometheanfire Exp $
EAPI=5
inherit depend.apache eutils cmake-utils toolchain-funcs user versionator systemd
@@ -50,9 +50,8 @@ src_configure() {
-DICINGA2_GROUP=icingacmd
-DICINGA2_COMMAND_USER=icinga
-DICINGA2_COMMAND_GROUP=icingacmd
+ -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
)
-# -DUSE_SYSTEMD=ON
-
cmake-utils_src_configure
}
@@ -95,10 +94,13 @@ src_install() {
keepdir /var/lib/icinga/archives
keepdir /var/lib/icinga/rw
keepdir /var/lib/icinga/spool/checkresults
- keepdir /usr/var/lib/icinga2
+
+ #remove dirs that shouldn't be installed
+ rm -r "${D}var/run" || die "failed to remove /var/run"
+ rm -r "${D}var/cache" || die "failed to remove /var/cache"
fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
- fowners icinga:icinga /usr/var/lib/icinga2 || die "Failed chown of /usr/var/lib/icinga2"
+ fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
}
pkg_postinst() {