summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2011-11-25 11:47:37 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2011-11-25 11:47:37 -0500
commit7dc7eb44ba119d2c337316392a374e58ada67f84 (patch)
tree752b4b9e42eda2349fc6b6a3df69c3c522dcbdc4 /net-analyzer
parentFirst beta of 1.6 (diff)
downloadprometheanfire-7dc7eb44ba119d2c337316392a374e58ada67f84.tar.gz
prometheanfire-7dc7eb44ba119d2c337316392a374e58ada67f84.tar.bz2
prometheanfire-7dc7eb44ba119d2c337316392a374e58ada67f84.zip
removed need for sed (more configure options)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/icinga/Manifest2
-rw-r--r--net-analyzer/icinga/icinga-1.6.0_beta.ebuild8
2 files changed, 7 insertions, 3 deletions
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index daa0bbd..22007e1 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -6,6 +6,8 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
AUX ido2db-init.d 924 RMD160 b4756574f38fed0fc85ecfae1bf353a4811fa4e2 SHA1 f7bf09a34fe55dd49c3381ca11781a643e4d1ca0 SHA256 88913ba8d8d2824e52ea26d93bdb7587d6ab53020546a6a98c9e9d337cc17985
DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
+DIST icinga-1.6.0beta.tar.gz 24259227 RMD160 7ecaafea35fee3b126c305accd1e93b7035e79e2 SHA1 912e76ba6a7cf82bd97b036afee0e2aa8f57922c SHA256 7685cb7995b759fff59b33fcfcd25016e3c01f67af6f23b4784ab4cf240d94ea
EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
+EBUILD icinga-1.6.0_beta.ebuild 6909 RMD160 472c3d000dd18ad3eb81beedfc1b33a279520f4e SHA1 63568b272817c827f7385bf6f77473aca0802094 SHA256 088158a13f5772bea4bebaf05d1cfced7f277a16bb5b052b05ccc90a43c9bfc1
MISC ChangeLog 1263 RMD160 3546d154e79d77a55f86468785af3562d7f52f2c SHA1 84c907dcd8297548ef9a924a2bae377b084d7957 SHA256 679b1c3fd518fd376c9c8f838a44f7c67d18a144911e56fc8f3cb3527e80e9c5
MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d
diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
index 0a9fe6f..28d26d8 100644
--- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild
@@ -109,7 +109,9 @@ src_configure() {
--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
--datarootdir=/usr/share/icinga/htdocs
--localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga"
+ --sysconfdir=/etc/icinga
+ --with-lockfile=/var/run/icinga/icinga.lock
+ --with-temp-dir=/tmp/icinga"
if use plugins ; then
myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
@@ -156,8 +158,8 @@ src_install() {
emake DESTDIR="${D}" install{,-config,-commandmode} || die
- sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
- sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+# sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
+# sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
if use idoutils ; then
emake DESTDIR="${D}" install-idoutils || die