net-analyzer/icinga: changed log directory to /var/log/icinga/

svn path=/sunrise/; revision=11871

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 5bf4e44d2c2047f97e347285fe9508e94c9087de..7dccd8e45dc42d9325703c93d5dffa7a07ccc580 100644 (file)
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2011; mthode <mthode@mthode.org> icinga-1.3.1.ebuild:
+  changed log directory to /var/log/icinga/
+
   31 Mar 2011; mthode <mthode@mthode.org> -icinga-1.3.0-r2.ebuild,
   +icinga-1.3.1.ebuild:
   reinstated virtual/mailx, I was stupid, also a version bump (bugfix

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 687da3b0037dc810fd74480b20ddae396da0a0a7..5364f9946d25c335a684ec176ee97db4d2b2179f 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -5,6 +5,6 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72
 DIST icinga-1.3.1.tar.gz 12158923 RMD160 b0b82ef3e9eb999493af3ce26f9252661d34fdaa SHA1 fb2e87ed5edbb86d9476bce9487811c7b2ed1f16 SHA256 b6eec308091a9b87b885e57e41184c496de0894660dd833074ecf4dd2cf180e0
-EBUILD icinga-1.3.1.ebuild 5886 RMD160 490578fd906016db1c8fdf8ab55408bf3888ee31 SHA1 5c223ac6eccd748bf924f793dfdbac01e6181cba SHA256 221179169718bce6f6840298153b8b620ca82585fa51dda70310a74dc7865796
-MISC ChangeLog 3179 RMD160 8aa5b7f2708e47dab2e02084e86e3e46bc54f03e SHA1 b88ad1e7217bf494b52d9abaee21a8d0d9569835 SHA256 e5d8e88d06e30050d3adbfbc4458e579fe0b6b44e3166546ed1bab1ca43d3738
+EBUILD icinga-1.3.1.ebuild 6114 RMD160 588bac4080d1103044f98e7f148c96fca65ec3ca SHA1 1e1a05a3729f6ce6cfbccf533fee0179ee9ac17e SHA256 20e868b80de08b2306a9e88384ec3897185fcdbf13fcf097d1d6ea1255d99a71
+MISC ChangeLog 3287 RMD160 c5454f3bbce9dcd259a4a8d7763e9e1a13235fa5 SHA1 2724be897158b2f27bc13969f9d331eed11a4eca SHA256 b98a45b5cf23c3dc0688ca2ad383f53c18b86e51310d1fc7ea28b80c34707230
 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e

diff --git a/net-analyzer/icinga/icinga-1.3.1.ebuild b/net-analyzer/icinga/icinga-1.3.1.ebuild
index a1313f3d15519c443e9ca3f9e7319e828b8192b3..052bfbbc1a4dc6d50f1f43bb770cacb65e387785 100644 (file)
--- a/net-analyzer/icinga/icinga-1.3.1.ebuild
+++ b/net-analyzer/icinga/icinga-1.3.1.ebuild
@@ -174,7 +174,12 @@ src_install() {
 
        fi
 
-       fowners -R icinga:icinga /etc/icinga /var/icinga || die "Failed chown of /etc/icinga"
+       mkdir -p "${D}"/var/log/icinga
+
+       fowners -R icinga:icinga /etc/icinga /var/icinga /var/log/icinga || die "Failed chown of /etc/icinga"
+
+       sed -i -e 's:^log_file=.*:log_file=/var/log/icinga/icinga.log:' "${D}"/etc/icinga/icinga.cfg
+       mv "${D}"/var/icinga/icinga.log "${D}"/var/log/icinga/icinga.log
 
        fowners -R root:root /usr/$(get_libdir)/icinga
        cd "${D}" || die
@@ -186,6 +191,7 @@ src_install() {
        keepdir /var/icinga/archives
        keepdir /var/icinga/rw
        keepdir /var/icinga/spool/checkresults
+       keepdir /var/log
 
        if use apache2 ; then
                webserver=apache