| 1 |
prometheanfire 13/12/23 02:52:36 |
| 2 |
|
| 3 |
Modified: icinga-web-1.10.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
trying to fix bug 493902 |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 net-analyzer/icinga-web/icinga-web-1.10.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: icinga-web-1.10.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- icinga-web-1.10.0.ebuild 23 Dec 2013 00:14:53 -0000 1.2 |
| 23 |
+++ icinga-web-1.10.0.ebuild 23 Dec 2013 02:52:36 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v 1.2 2013/12/23 00:14:53 prometheanfire Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild,v 1.3 2013/12/23 02:52:36 prometheanfire Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -80,7 +80,7 @@ |
| 33 |
dodoc README |
| 34 |
rm -f README |
| 35 |
|
| 36 |
- emake -j1 DESTDIR="${D}" install |
| 37 |
+ emake -j5 DESTDIR="${D}" install |
| 38 |
|
| 39 |
emake DESTDIR="${D}" install-javascript |
| 40 |
|
| 41 |
@@ -88,7 +88,8 @@ |
| 42 |
dodir ${APACHE_MODULES_CONFDIR} |
| 43 |
emake DESTDIR="${D}" install-apache-config |
| 44 |
echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" |
| 45 |
- cat "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" |
| 46 |
+ cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" |
| 47 |
+ rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed" |
| 48 |
echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" |
| 49 |
fi |
| 50 |
|
| 51 |
@@ -191,7 +192,7 @@ |
| 52 |
if use apache2 ; then |
| 53 |
einfo |
| 54 |
einfo "apache config was installed into" |
| 55 |
- einfo "/etc/apache2/modules.d//99_icinga-web.conf" |
| 56 |
+ einfo "/etc/apache2/modules.d/99_icinga-web.conf" |
| 57 |
einfo |
| 58 |
einfo "The apache config value for \'ServerTokens\' must be set to at" |
| 59 |
einfo "least \'Min\'." |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.17 net-analyzer/icinga-web/ChangeLog |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga-web/ChangeLog?rev=1.17&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga-web/ChangeLog?rev=1.17&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga-web/ChangeLog?r1=1.16&r2=1.17 |
| 68 |
|
| 69 |
Index: ChangeLog |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v |
| 72 |
retrieving revision 1.16 |
| 73 |
retrieving revision 1.17 |
| 74 |
diff -u -r1.16 -r1.17 |
| 75 |
--- ChangeLog 23 Dec 2013 00:14:53 -0000 1.16 |
| 76 |
+++ ChangeLog 23 Dec 2013 02:52:36 -0000 1.17 |
| 77 |
@@ -1,6 +1,10 @@ |
| 78 |
# ChangeLog for net-analyzer/icinga-web |
| 79 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.16 2013/12/23 00:14:53 prometheanfire Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-web/ChangeLog,v 1.17 2013/12/23 02:52:36 prometheanfire Exp $ |
| 82 |
+ |
| 83 |
+ 23 Dec 2013; Matthew Thode <prometheanfire@g.o> |
| 84 |
+ icinga-web-1.10.0.ebuild: |
| 85 |
+ trying to fix bug 493902 |
| 86 |
|
| 87 |
23 Dec 2013; Matthew Thode <prometheanfire@g.o> |
| 88 |
icinga-web-1.10.0.ebuild: |
Archives