net-analyzer/icinga: removed the logdir sed and added --with-log-dir=/var/log/icinga...

svn path=/sunrise/; revision=12339

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 54ad38bc37c1ba3616a707d9a250271a8b8decb2..6bb646ac54491da9c8f935d5e1052d9b445c744d 100644 (file)
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Aug 2011; mthode <mthode@mthode.org> -icinga-1.4.2.ebuild,
+  +icinga-1.5.0.ebuild:
+  removed the logdir sed and added --with-log-dir=/var/log/icinga; also added
+  comment to enewuser
+
   08 Jul 2011; mthode <mthode@mthode.org> -icinga-1.4.0.ebuild,
   +icinga-1.4.2.ebuild:
   version bump, tested amd64

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 1404d0714888c8572ea15f0a9c915861e5c3f1c3..04c64caee2af015e9a1f575a418fa3a27fa6bf55 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -4,7 +4,7 @@ AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 815 RMD160 d6b1d0a682ca12d45b917a218a02411b5baf4324 SHA1 7c4f5bf146f9ef166463b7d4c495cf30353895d1 SHA256 1d1b17e400b4bac144e6cdbf4bdabf9adbb8166f8814ac02f4955bddf56e43e6
-DIST icinga-1.4.2.tar.gz 15379151 RMD160 bb2156d28f9200e76d33b9efe869dc997f8ae829 SHA1 0cc77158414abda9d195219d3f81ddff8e409e27 SHA256 506022493295bda95aa2514bfdc3196063ed936655bc60068f61543504b42aa6
-EBUILD icinga-1.4.2.ebuild 6220 RMD160 1dcfe16d426bbc05f602af643254820fbeb2d458 SHA1 bd069ccc397a25a5f1c3f8ed7843ba5abb202d89 SHA256 923eca3026b8a26a265b61748b2f53974f2e0b3b984fba029468d79e7b581288
-MISC ChangeLog 4224 RMD160 c8505b47caf046d04d6d2e8e9530b87a85566e3c SHA1 74623c2b4feb556e69921b568492f56fb50ff548 SHA256 deae8c275429b1ceeb065754e25d9532d5e3ec7d8241665746a3423c061d7746
+DIST icinga-1.5.0.tar.gz 24601372 RMD160 0597e4b14ac608ecde1b7ecd6a2049b3a09ac9a9 SHA1 e7cc434aac8e966436b18c17a448e4c5077515b8 SHA256 c30bf2f94fb972403c4369abbbd98dcbbf2a0590b83b6a46aa18dbd85a861242
+EBUILD icinga-1.5.0.ebuild 5961 RMD160 ad443ee990e2a35b415cb6c42f1fd36d4119e872 SHA1 ec5f074cb1a10a7b663d8727aa1c57fb32729e7e SHA256 2cc26850a8ff792b39e25557d70c648c55b41efba14f8cce326ddbdab7603472
+MISC ChangeLog 4413 RMD160 2bcacfd38cfcf9202dca2ea2842954d1f9e711b6 SHA1 5e85429330beeba2c792aacc672893f11d69f135 SHA256 233b86f5d5a376870c505b1c81e78fd30a0957079a2dba3887389b02648389c5
 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e

diff --git a/net-analyzer/icinga/icinga-1.4.2.ebuild b/net-analyzer/icinga/icinga-1.5.0.ebuild
similarity index 93%
rename from net-analyzer/icinga/icinga-1.4.2.ebuild
rename to net-analyzer/icinga/icinga-1.5.0.ebuild
index 955e46ddb85cb94eeffff0fdbaff690fbd0c2301..e22112338179298583ac3e7539e84cb67d483139 100644 (file)
--- a/net-analyzer/icinga/icinga-1.4.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.5.0.ebuild
@@ -31,7 +31,7 @@ want_apache2
 pkg_setup() {
        depend.apache_pkg_setup
        enewgroup icinga
-       enewuser icinga -1 -1 /var/spool/icinga icinga
+       enewuser icinga -1 -1 /var/spool/icinga icinga -c "icinga alert"
        if use web ; then
                elog "This does not include cgis that are perl-dependent"
                elog "Currently traceroute.cgi is perl-dependent"
@@ -92,7 +92,8 @@ src_configure() {
        $(use_enable debug DEBUG4)
        $(use_enable debug DEBUG5)
        --disable-statuswrl
-       --with-cgiurl=/icinga/cgi-bin"
+       --with-cgiurl=/icinga/cgi-bin
+       --with-log-dir=/var/log/icinga"
 
        myconf2="--bindir=/usr/sbin
        --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
@@ -176,15 +177,8 @@ src_install() {
                        ewarn "out-of-the-box. Since you are not using one of them, you"
                        ewarn "have to configure your webserver accordingly yourself."
                fi
-
        fi
 
-       mkdir -p "${D}"/var/log/icinga || die "Failed mkdir of /var/log/icinga"
-
-       fowners -R icinga:icinga /etc/icinga /var/icinga /var/log/icinga || die
-
-       sed -i -e 's:^log_file=.*:log_file=/var/log/icinga/icinga.log:' "${D}"/etc/icinga/icinga.cfg || die "Failed sed of /etc/icinga/icinga.cfg"
-
        fowners -R root:root /usr/$(get_libdir)/icinga || die
        cd "${D}" || die
        find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
@@ -195,7 +189,6 @@ src_install() {
        keepdir /var/icinga/archives
        keepdir /var/icinga/rw
        keepdir /var/icinga/spool/checkresults
-       keepdir /var/log
 
        if use apache2 ; then
                webserver=apache
@@ -219,4 +212,4 @@ pkg_postinst() {
        elog "will not be happy as it relies on accessing the proc"
        elog "filesystem. You can fix this by adding icinga into"
        elog "the group wheel, but this is not recomended."
-}
+}
\ No newline at end of file