* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-02-27 22:01 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-02-27 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 8d7d87997d8b3dfd1bd0a3c73f3a6f96b6ba2f64
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 22:01:14 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 22:01:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8d7d8799
initial add of icinga-web
---
net-analyzer/icinga-web/ChangeLog | 9 ++
net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild | 82 ++++++++++++++++++++
2 files changed, 91 insertions(+), 0 deletions(-)
diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog
new file mode 100644
index 0000000..716e172
--- /dev/null
+++ b/net-analyzer/icinga-web/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for net-analyzer/icinga-web
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*icinga-web-1.6.1-r1 (27 Feb 2012)
+
+ 27 Feb 2012; mthode <mthode@gentoo.org> +icinga-web-1.6.1-r1.ebuild:
+ initial add and test of icinga-web
+
diff --git a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
new file mode 100644
index 0000000..b6289b7
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit depend.apache eutils
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pnp"
+DEPEND="dev-php/phing
+ dev-lang/php[apache2,mysql,pdo,json]
+ net-analyzer/icinga[apache2,idoutils,mysql]"
+RDEPEND="${DEPEND}"
+
+need_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+}
+
+src_configure() {
+ local myconf
+
+ myconf="--prefix=/usr/share/icinga/icinga-web
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --libexecdir=/usr/$(get_libdir)/icinga/plugins
+ --with-bin-user=icinga
+ --with-bin-group=icinga
+ --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+ --with-conf-dir=/etc/icinga-web
+ --with-web-apache-path=${APACHE_MODULES_CONFDIR}
+ --with-log-dir=/var/log/icinga-web"
+
+ econf ${myconf}
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install || die "make failed"
+
+ emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
+
+ dodir ${APACHE_MODULES_CONFDIR}
+ emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
+ mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
+
+ insinto /usr/share/icinga/icinga-web/contrib
+ doins -r etc/schema/* || die
+
+ sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
+ sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
+
+ insinto /etc/cron.d/
+ doins etc/scheduler/icingaCron || die
+
+ diropts -o apache -g apache
+ dodir /var/log/icinga-web
+
+ fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+
+ if use pnp ; then
+ sed -i 's/booleanConditionField/booleanConfitionField/g' contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
+ insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
+ doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
+ doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
+ fi
+}
+
+pkg_postinst() {
+ elog "do not forget to import the Database!"
+ elog
+}
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-02-28 1:59 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-02-28 1:59 UTC (permalink / raw
To: gentoo-commits
commit: 66aeb6894342154e5fb8d0dbba19eeebb2002abf
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 01:59:19 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 01:59:19 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=66aeb689
added manifest
---
net-analyzer/icinga-web/Manifest | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
new file mode 100644
index 0000000..938ec8e
--- /dev/null
+++ b/net-analyzer/icinga-web/Manifest
@@ -0,0 +1,3 @@
+DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
+EBUILD icinga-web-1.6.1-r1.ebuild 2293 RMD160 99b7ae5a042454da8f177ec0c92ed278d9777a0b SHA1 e801cb74a9f6202ebd39df6e96cbfa8f87ce54b5 SHA256 2f5c7ac082b7ddb7c5e236948aef1b29f360ecbe6903c1a914b097a29e5c4400
+MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-02-28 2:19 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-02-28 2:19 UTC (permalink / raw
To: gentoo-commits
commit: 820b440b436f064f7b19e523c3dca2e0841c6c32
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 02:19:16 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 02:19:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=820b440b
added xsl to php dep
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 938ec8e..ff6f636 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,3 +1,3 @@
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
-EBUILD icinga-web-1.6.1-r1.ebuild 2293 RMD160 99b7ae5a042454da8f177ec0c92ed278d9777a0b SHA1 e801cb74a9f6202ebd39df6e96cbfa8f87ce54b5 SHA256 2f5c7ac082b7ddb7c5e236948aef1b29f360ecbe6903c1a914b097a29e5c4400
+EBUILD icinga-web-1.6.1-r1.ebuild 2297 RMD160 0091791d0200a214ecbbd71814f072756ba1f861 SHA1 3967afed9ce55662750d44c5d7026f88d246809f SHA256 97df1280f543363b6b8bdcc97af3010235c8c6a077f11edbbc2febd33dbed144
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
index b6289b7..4c67a0a 100644
--- a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="pnp"
DEPEND="dev-php/phing
- dev-lang/php[apache2,mysql,pdo,json]
+ dev-lang/php[apache2,mysql,pdo,json,xsl]
net-analyzer/icinga[apache2,idoutils,mysql]"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-02-28 2:30 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-02-28 2:30 UTC (permalink / raw
To: gentoo-commits
commit: 1d3d8063f52b20d60d31f22c7f5853fad1d28be5
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 02:30:01 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 02:30:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=1d3d8063
changed to postgres for testing
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index ff6f636..e3edf36 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,3 +1,3 @@
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
-EBUILD icinga-web-1.6.1-r1.ebuild 2297 RMD160 0091791d0200a214ecbbd71814f072756ba1f861 SHA1 3967afed9ce55662750d44c5d7026f88d246809f SHA256 97df1280f543363b6b8bdcc97af3010235c8c6a077f11edbbc2febd33dbed144
+EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
index 4c67a0a..ee11639 100644
--- a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="pnp"
DEPEND="dev-php/phing
- dev-lang/php[apache2,mysql,pdo,json,xsl]
+ dev-lang/php[postgres,pdo,json,xsl]
net-analyzer/icinga[apache2,idoutils,mysql]"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-11 15:23 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-11 15:23 UTC (permalink / raw
To: gentoo-commits
commit: ee255d090947672424315fcf57a3795f5638eb95
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 15:23:12 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 15:23:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=ee255d09
manifest update
---
net-analyzer/icinga-web/Manifest | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index e3edf36..ce726b4 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,3 +1,6 @@
+AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
+DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
+EBUILD icinga-web-1.7.1-r1.ebuild 3774 RMD160 da14977471eedd10ddf2daa51fffaf59ff0409b4 SHA1 010109dd1f9ebc5ec534dbac2e92f530df692492 SHA256 1ff7cc5d9d44106150b19214851b0386b916103208c990ede924564b6406c105
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-11 18:43 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-11 18:43 UTC (permalink / raw
To: gentoo-commits
commit: ef0ab25f57ca42ed3f6a88b304fbc1a50017202d
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 18:43:17 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 18:43:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=ef0ab25f
trying to make it work without forcing apache
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 61 +++++++++++++++----
2 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index ce726b4..95b7912 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
-EBUILD icinga-web-1.7.1-r1.ebuild 3774 RMD160 da14977471eedd10ddf2daa51fffaf59ff0409b4 SHA1 010109dd1f9ebc5ec534dbac2e92f530df692492 SHA256 1ff7cc5d9d44106150b19214851b0386b916103208c990ede924564b6406c105
+EBUILD icinga-web-1.7.1-r1.ebuild 4609 RMD160 1bf979d5e6f4fac18a802dd83ec31290c4c1daed SHA1 e12afed3c25411f9b58775c0ab67a770258ac2a7 SHA256 4302a7bb6ba48c002a5cfcb142a60ee985e99520eda1fa61dd0f6f51ba7afc62
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
index b91149e..77e3304 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
@@ -12,16 +12,19 @@ SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="pnp"
+IUSE="apache mysql pnp postgres"
DEPEND="dev-php/phing
- dev-lang/php[apache2,cli,mysql,pdo,json]
- net-analyzer/icinga[apache2,idoutils,mysql]"
+ dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
+ pnp? ( net-analyzer/pnp4nagios )"
RDEPEND="${DEPEND}"
need_apache2
pkg_setup() {
depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
}
src_prepare() {
@@ -39,14 +42,24 @@ src_configure() {
--sysconfdir=/etc/icinga
--libexecdir=/usr/$(get_libdir)/icinga/plugins
--with-bin-user=icinga
- --with-bin-group=icinga
- --with-web-user=apache
- --with-web-group=apache
- --with-web-apache-path=${APACHE_MODULES_CONFDIR}
+ --with-bin-group=nagios
--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
--with-conf-dir=/etc/icinga-web
--with-log-dir=/var/log/icinga-web"
+ if use apache ; then
+ myconf+=" --with-web-user=apache
+ --with-web-group=apache
+ --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+ else
+ myconf+=" --with-web-user=root
+ --with-web-group=root"
+ fi
+
+ if use postgres ; then
+ myconf+=" --with-db-type=postgres"
+ fi
+
econf ${myconf}
}
@@ -55,23 +68,38 @@ src_install() {
emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
- dodir ${APACHE_MODULES_CONFDIR}
- emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
- mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
+ if use apache ; then
+ dodir ${APACHE_MODULES_CONFDIR}
+ emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
+ mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
+ fi
insinto /usr/share/icinga/icinga-web/contrib
doins -r etc/schema/* || die
- sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
+ if use apache ; then
+ sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
+ else
+ sed -i 's/%%USER%%/root/g' etc/scheduler/icingaCron
+ fi
sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
insinto /etc/cron.d/
doins etc/scheduler/icingaCron || die
- diropts -o apache -g apache
+ if use apache ; then
+ diropts -o apache -g apache
+ else
+ diropts -o root -g root
+ fi
dodir /var/log/icinga-web
- fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+ if use apache ; then
+ fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+ else
+ fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+ fi
+
if use pnp ; then
insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
@@ -113,5 +141,12 @@ pkg_postinst() {
einfo
einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
einfo
+
+ if use apache ; then
+ einfo
+ einfo "The apache config value for \'ServerTokens\' must be set to at"
+ einfo "least \'Min\'."
+ einfo
+ fi
}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-11 18:56 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-11 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 7151e5d7bea3fb3adc30665378058b62c9ad5c9b
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 18:56:01 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 18:56:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=7151e5d7
changed use flag from apache to apache2
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 95b7912..b898159 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
-EBUILD icinga-web-1.7.1-r1.ebuild 4609 RMD160 1bf979d5e6f4fac18a802dd83ec31290c4c1daed SHA1 e12afed3c25411f9b58775c0ab67a770258ac2a7 SHA256 4302a7bb6ba48c002a5cfcb142a60ee985e99520eda1fa61dd0f6f51ba7afc62
+EBUILD icinga-web-1.7.1-r1.ebuild 4616 RMD160 17ece907a5a1134f25c9e980905832f087c14ce4 SHA1 0a94916e0c3f3c836d9b3a04a9fe79affb417b06 SHA256 ee8c22ad11a318355232abdfdaaa62df6611d6c998b2e77b708d02f5028b36cd
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
index 77e3304..21e51d0 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="apache mysql pnp postgres"
+IUSE="apache2 mysql pnp postgres"
DEPEND="dev-php/phing
dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
pnp? ( net-analyzer/pnp4nagios )"
@@ -47,7 +47,7 @@ src_configure() {
--with-conf-dir=/etc/icinga-web
--with-log-dir=/var/log/icinga-web"
- if use apache ; then
+ if use apache2 ; then
myconf+=" --with-web-user=apache
--with-web-group=apache
--with-web-apache-path=${APACHE_MODULES_CONFDIR}"
@@ -68,7 +68,7 @@ src_install() {
emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
- if use apache ; then
+ if use apache2 ; then
dodir ${APACHE_MODULES_CONFDIR}
emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
@@ -77,7 +77,7 @@ src_install() {
insinto /usr/share/icinga/icinga-web/contrib
doins -r etc/schema/* || die
- if use apache ; then
+ if use apache2 ; then
sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
else
sed -i 's/%%USER%%/root/g' etc/scheduler/icingaCron
@@ -87,14 +87,14 @@ src_install() {
insinto /etc/cron.d/
doins etc/scheduler/icingaCron || die
- if use apache ; then
+ if use apache2 ; then
diropts -o apache -g apache
else
diropts -o root -g root
fi
dodir /var/log/icinga-web
- if use apache ; then
+ if use apache2 ; then
fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
else
fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
@@ -142,7 +142,7 @@ pkg_postinst() {
einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
einfo
- if use apache ; then
+ if use apache2 ; then
einfo
einfo "The apache config value for \'ServerTokens\' must be set to at"
einfo "least \'Min\'."
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-11 19:38 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-11 19:38 UTC (permalink / raw
To: gentoo-commits
commit: 51ce670e48a2169fbdb76b2d4a6294fb635dae19
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 19:38:14 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 19:38:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=51ce670e
set the db port for postgres is use flag is set
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index b898159..bc34c25 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
-EBUILD icinga-web-1.7.1-r1.ebuild 4616 RMD160 17ece907a5a1134f25c9e980905832f087c14ce4 SHA1 0a94916e0c3f3c836d9b3a04a9fe79affb417b06 SHA256 ee8c22ad11a318355232abdfdaaa62df6611d6c998b2e77b708d02f5028b36cd
+EBUILD icinga-web-1.7.1-r1.ebuild 4638 RMD160 c951549f86095a8e5fa3c53389e1ae0831bea9a3 SHA1 5feed097525ed9ed03bb531c291007ca3c5c6b5d SHA256 80aaf1b01a4c1c831c8714ab10b0b7da4b8e788fe6f341389bba9ce52f2f0834
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
index 21e51d0..af5c060 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
@@ -57,7 +57,8 @@ src_configure() {
fi
if use postgres ; then
- myconf+=" --with-db-type=postgres"
+ myconf+=" --with-db-type=postgres
+ --with-db-port=5432"
fi
econf ${myconf}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-11 20:04 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-11 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 7c9a3e452ec4db662ccc094ac30a46de73068014
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 20:04:32 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 20:04:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=7c9a3e45
switch dbtype to pgsql from postgres
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index bc34c25..0a0caf2 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
-EBUILD icinga-web-1.7.1-r1.ebuild 4638 RMD160 c951549f86095a8e5fa3c53389e1ae0831bea9a3 SHA1 5feed097525ed9ed03bb531c291007ca3c5c6b5d SHA256 80aaf1b01a4c1c831c8714ab10b0b7da4b8e788fe6f341389bba9ce52f2f0834
+EBUILD icinga-web-1.7.1-r1.ebuild 4635 RMD160 f774ad0d7e06421717f2dc5e727761743d3536da SHA1 de088721595f9cdd6bb9811ae56dff1a97162f68 SHA256 9cc9292e18bf2ccc14f21110127a4b10d21359ff93eb900fc7d09159eb0acfe6
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
index af5c060..f561ab1 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
@@ -57,7 +57,7 @@ src_configure() {
fi
if use postgres ; then
- myconf+=" --with-db-type=postgres
+ myconf+=" --with-db-type=pgsql
--with-db-port=5432"
fi
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-12 18:00 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-12 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 977c8d69241983923fdbf634f378010198e51c96
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 03:29:47 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 03:29:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=977c8d69
set postgresql for api if use flag is set
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 0a0caf2..a0bc51d 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
-EBUILD icinga-web-1.7.1-r1.ebuild 4635 RMD160 f774ad0d7e06421717f2dc5e727761743d3536da SHA1 de088721595f9cdd6bb9811ae56dff1a97162f68 SHA256 9cc9292e18bf2ccc14f21110127a4b10d21359ff93eb900fc7d09159eb0acfe6
+EBUILD icinga-web-1.7.1-r1.ebuild 4685 RMD160 8784b9d038d3073ed6d10eb5fad0fe2c2c5a25a8 SHA1 adbe3bcc5f2d90851852cf1f9218a2f068595b10 SHA256 2bc33fd85da48b745331802636111b0781942b2d883e2164f7e09a481fe1ee51
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
index f561ab1..7c37e27 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
@@ -58,7 +58,9 @@ src_configure() {
if use postgres ; then
myconf+=" --with-db-type=pgsql
- --with-db-port=5432"
+ --with-db-port=5432
+ --with-api-subtype=pgsql
+ --with-api-port=5432"
fi
econf ${myconf}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-12 18:00 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-12 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 5b89f2dd1eddda469a13f24a57c3a01b0040c6b4
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 18:00:34 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 18:00:34 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=5b89f2dd
want_apache not need_apache
---
net-analyzer/icinga-web/Manifest | 2 +-
net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index a0bc51d..1245f65 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -2,5 +2,5 @@ AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8
DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
-EBUILD icinga-web-1.7.1-r1.ebuild 4685 RMD160 8784b9d038d3073ed6d10eb5fad0fe2c2c5a25a8 SHA1 adbe3bcc5f2d90851852cf1f9218a2f068595b10 SHA256 2bc33fd85da48b745331802636111b0781942b2d883e2164f7e09a481fe1ee51
+EBUILD icinga-web-1.7.1-r1.ebuild 4838 RMD160 2563e7663babe8a9ba26d9787566d860fadcda3b SHA1 b78fc5f399c7f5c1f01f6e226cd795477fe703fa SHA256 d40113fb19d7b6219db7810dc373d720caca1816b93ee8969b332679a1549c13
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
index 7c37e27..bdc004a 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
@@ -18,10 +18,12 @@ DEPEND="dev-php/phing
pnp? ( net-analyzer/pnp4nagios )"
RDEPEND="${DEPEND}"
-need_apache2
+want_apache2
pkg_setup() {
- depend.apache_pkg_setup
+ if use apache2 ; then
+ depend.apache_pkg_setup
+ fi
enewgroup icinga
enewgroup nagios
enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
@@ -45,7 +47,10 @@ src_configure() {
--with-bin-group=nagios
--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
--with-conf-dir=/etc/icinga-web
- --with-log-dir=/var/log/icinga-web"
+ --with-log-dir=/var/log/icinga-web
+ --with-icinga-objects-dir=/etc/icinga/objects
+ --with-icinga-bin=/usr/sbin/icinga
+ --with-icinga-cfg=/etc/icinga/icinga.cfg"
if use apache2 ; then
myconf+=" --with-web-user=apache
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-13 16:13 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-13 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 8ac88fc1af769c4ee0bda6bdcfd8c02c8b6d9871
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Jul 13 15:56:51 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 15:56:51 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=8ac88fc1
removed 1.6.1, removed some apache eutils stuff, it will be pulled in if
the use flag is set.
---
net-analyzer/icinga-web/Manifest | 3 +-
net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild | 82 ----------
net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild | 164 ++++++++++++++++++++
3 files changed, 165 insertions(+), 84 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 1245f65..9abb31a 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,6 +1,5 @@
AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85
-DIST icinga-web-1.6.1.tar.gz 14735674 RMD160 106ab4b215e1adff53665ee43e25ea02d9715825 SHA1 58814f27f0e137b0dc5f56c3abdc223fa02958e4 SHA256 41c2d699355c6371447f551730e2dba80a0117f34f0608fa249e292904708ab4
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
-EBUILD icinga-web-1.6.1-r1.ebuild 2292 RMD160 08005fc9e9fdd502e280f3b395c1764c1297d949 SHA1 ca36ffcc4013457099f0670b61746770f8c20335 SHA256 280bb7b6abd6523aa8ef413de6adb825c2d0ac809b06e4402883aaec45e0430a
EBUILD icinga-web-1.7.1-r1.ebuild 4838 RMD160 2563e7663babe8a9ba26d9787566d860fadcda3b SHA1 b78fc5f399c7f5c1f01f6e226cd795477fe703fa SHA256 d40113fb19d7b6219db7810dc373d720caca1816b93ee8969b332679a1549c13
+EBUILD icinga-web-1.7.1-r2.ebuild 5038 RMD160 16a921f0514654b62830eae4d586b67b6d0017b0 SHA1 71ce8cdab51f21b1e50433a42c48d75fa8bff842 SHA256 be111f4f15624e9e91e29fab1e22bdcfc9196124eefd9e6e44f095534fbba034
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
diff --git a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
deleted file mode 100644
index ee11639..0000000
--- a/net-analyzer/icinga-web/icinga-web-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit depend.apache eutils
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pnp"
-DEPEND="dev-php/phing
- dev-lang/php[postgres,pdo,json,xsl]
- net-analyzer/icinga[apache2,idoutils,mysql]"
-RDEPEND="${DEPEND}"
-
-need_apache2
-
-pkg_setup() {
- depend.apache_pkg_setup
-}
-
-src_configure() {
- local myconf
-
- myconf="--prefix=/usr/share/icinga/icinga-web
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --libexecdir=/usr/$(get_libdir)/icinga/plugins
- --with-bin-user=icinga
- --with-bin-group=icinga
- --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
- --with-conf-dir=/etc/icinga-web
- --with-web-apache-path=${APACHE_MODULES_CONFDIR}
- --with-log-dir=/var/log/icinga-web"
-
- econf ${myconf}
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install || die "make failed"
-
- emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
-
- dodir ${APACHE_MODULES_CONFDIR}
- emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
- mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
-
- insinto /usr/share/icinga/icinga-web/contrib
- doins -r etc/schema/* || die
-
- sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
- sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
-
- insinto /etc/cron.d/
- doins etc/scheduler/icingaCron || die
-
- diropts -o apache -g apache
- dodir /var/log/icinga-web
-
- fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
-
- if use pnp ; then
- sed -i 's/booleanConditionField/booleanConfitionField/g' contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
- insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
- doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
- doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
- fi
-}
-
-pkg_postinst() {
- elog "do not forget to import the Database!"
- elog
-}
-
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild
new file mode 100644
index 0000000..2df97df
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/"
+SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+ dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
+ pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewgroup icinga
+ enewgroup nagios
+ enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-disable-compression.patch"
+}
+
+src_configure() {
+ local myconf
+ myconf="--prefix=/usr/share/icinga/icinga-web
+ --bindir=/usr/sbin
+ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+ --datarootdir=/usr/share/icinga/htdocs
+ --localstatedir=/var/lib/icinga
+ --sysconfdir=/etc/icinga
+ --libexecdir=/usr/$(get_libdir)/icinga/plugins
+ --with-bin-user=icinga
+ --with-bin-group=nagios
+ --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+ --with-conf-dir=/etc/icinga-web
+ --with-log-dir=/var/log/icinga-web
+ --with-icinga-objects-dir=/etc/icinga/objects
+ --with-icinga-bin=/usr/sbin/icinga
+ --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+ if use apache2 ; then
+ myconf+=" --with-web-user=apache
+ --with-web-group=apache
+ --with-web-apache-path=/etc/apache2/modules.d/"
+ else
+ myconf+=" --with-web-user=root
+ --with-web-group=root"
+ fi
+
+ if use postgres ; then
+ myconf+=" --with-db-type=pgsql
+ --with-db-port=5432
+ --with-api-subtype=pgsql
+ --with-api-port=5432"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ dodoc README
+ rm -f README
+
+ emake -j1 DESTDIR="${D}" install || die "make failed"
+ emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
+
+ if use apache2 ; then
+ dodir /etc/apache2/modules.d/
+ emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
+ mv ${D}/etc/apache2/modules.d/icinga-web.conf ${D}/etc/apache2/modules.d//99_icinga-web.conf
+ fi
+
+ insinto /usr/share/icinga/icinga-web/contrib
+ doins -r etc/schema/* || die
+
+ if use apache2 ; then
+ sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
+ else
+ sed -i 's/%%USER%%/root/g' etc/scheduler/icingaCron
+ fi
+ sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
+
+ insinto /etc/cron.d/
+ doins etc/scheduler/icingaCron || die
+
+ if use apache2 ; then
+ diropts -o apache -g apache
+ else
+ diropts -o root -g root
+ fi
+ dodir /var/log/icinga-web
+
+ if use apache2 ; then
+ fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+ else
+ fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
+ fi
+
+
+ if use pnp ; then
+ insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
+ doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
+ doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
+ fi
+}
+
+pkg_postinst() {
+ einfo
+ einfo "If this is a new install, you must create a new database for it, e.g. icinga_web."
+ einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/."
+ einfo
+ einfo "Additionally, you need to setup a database user."
+ einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE."
+ einfo
+ einfo "Example for a MySQL database:"
+ einfo " echo \"CREATE DATABASE icinga_web;\" | mysql"
+ einfo " echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
+ einfo " echo \"FLUSH PRIVILEGES;\" | mysql"
+ einfo
+ einfo " cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
+ einfo
+
+ ewarn
+ ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
+ ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
+ ewarn
+ ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between,"
+ ewarn " be advised that you need to apply those upgrade files with incremental steps!"
+ ewarn
+ ewarn "Example to upgrade a MySQL database:"
+ ewarn " cat /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web"
+ ewarn
+ ewarn "Don't forget to clear the config cache."
+ ewarn " /usr/share/icinga/icinga-web/bin/clearcache.sh"
+ ewarn
+
+ einfo
+ einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
+ einfo
+
+ if use apache2 ; then
+ einfo
+ einfo "apache config was installed into"
+ einfo "/etc/apache2/modules.d//99_icinga-web.conf"
+ einfo
+ einfo "The apache config value for \'ServerTokens\' must be set to at"
+ einfo "least \'Min\'."
+ einfo
+ else
+ einfo
+ einfo "If you are not using apache you may need to change some"
+ einfo "permissions, so that your web server can access files and logs"
+ einfo
+ fi
+}
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-16 14:58 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-16 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 19792eea59d306aaa6f121abf4ebc21868b96114
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jul 16 14:57:33 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 14:57:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=19792eea
what I'm gonna add to the tree
---
net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild | 164 --------------------
...web-1.7.1-r1.ebuild => icinga-web-1.7.1.ebuild} | 21 ++-
2 files changed, 16 insertions(+), 169 deletions(-)
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild
deleted file mode 100644
index 2df97df..0000000
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
- dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
- pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup icinga
- enewgroup nagios
- enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-disable-compression.patch"
-}
-
-src_configure() {
- local myconf
- myconf="--prefix=/usr/share/icinga/icinga-web
- --bindir=/usr/sbin
- --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
- --datarootdir=/usr/share/icinga/htdocs
- --localstatedir=/var/lib/icinga
- --sysconfdir=/etc/icinga
- --libexecdir=/usr/$(get_libdir)/icinga/plugins
- --with-bin-user=icinga
- --with-bin-group=nagios
- --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
- --with-conf-dir=/etc/icinga-web
- --with-log-dir=/var/log/icinga-web
- --with-icinga-objects-dir=/etc/icinga/objects
- --with-icinga-bin=/usr/sbin/icinga
- --with-icinga-cfg=/etc/icinga/icinga.cfg"
-
- if use apache2 ; then
- myconf+=" --with-web-user=apache
- --with-web-group=apache
- --with-web-apache-path=/etc/apache2/modules.d/"
- else
- myconf+=" --with-web-user=root
- --with-web-group=root"
- fi
-
- if use postgres ; then
- myconf+=" --with-db-type=pgsql
- --with-db-port=5432
- --with-api-subtype=pgsql
- --with-api-port=5432"
- fi
-
- econf ${myconf}
-}
-
-src_install() {
- dodoc README
- rm -f README
-
- emake -j1 DESTDIR="${D}" install || die "make failed"
- emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
-
- if use apache2 ; then
- dodir /etc/apache2/modules.d/
- emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
- mv ${D}/etc/apache2/modules.d/icinga-web.conf ${D}/etc/apache2/modules.d//99_icinga-web.conf
- fi
-
- insinto /usr/share/icinga/icinga-web/contrib
- doins -r etc/schema/* || die
-
- if use apache2 ; then
- sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron
- else
- sed -i 's/%%USER%%/root/g' etc/scheduler/icingaCron
- fi
- sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
-
- insinto /etc/cron.d/
- doins etc/scheduler/icingaCron || die
-
- if use apache2 ; then
- diropts -o apache -g apache
- else
- diropts -o root -g root
- fi
- dodir /var/log/icinga-web
-
- if use apache2 ; then
- fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
- else
- fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
- fi
-
-
- if use pnp ; then
- insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
- doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
- doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
- fi
-}
-
-pkg_postinst() {
- einfo
- einfo "If this is a new install, you must create a new database for it, e.g. icinga_web."
- einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/."
- einfo
- einfo "Additionally, you need to setup a database user."
- einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE."
- einfo
- einfo "Example for a MySQL database:"
- einfo " echo \"CREATE DATABASE icinga_web;\" | mysql"
- einfo " echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
- einfo " echo \"FLUSH PRIVILEGES;\" | mysql"
- einfo
- einfo " cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
- einfo
-
- ewarn
- ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
- ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
- ewarn
- ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between,"
- ewarn " be advised that you need to apply those upgrade files with incremental steps!"
- ewarn
- ewarn "Example to upgrade a MySQL database:"
- ewarn " cat /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web"
- ewarn
- ewarn "Don't forget to clear the config cache."
- ewarn " /usr/share/icinga/icinga-web/bin/clearcache.sh"
- ewarn
-
- einfo
- einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
- einfo
-
- if use apache2 ; then
- einfo
- einfo "apache config was installed into"
- einfo "/etc/apache2/modules.d//99_icinga-web.conf"
- einfo
- einfo "The apache config value for \'ServerTokens\' must be set to at"
- einfo "least \'Min\'."
- einfo
- else
- einfo
- einfo "If you are not using apache you may need to change some"
- einfo "permissions, so that your web server can access files and logs"
- einfo
- fi
-}
-
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.7.1.ebuild
similarity index 83%
rename from net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
rename to net-analyzer/icinga-web/icinga-web-1.7.1.ebuild
index bdc004a..aee5a8b 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1-r1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.7.1.ebuild
@@ -72,6 +72,9 @@ src_configure() {
}
src_install() {
+ dodoc README
+ rm -f README
+
emake -j1 DESTDIR="${D}" install || die "make failed"
emake -j1 DESTDIR="${D}" install-javascript || die "make failed"
@@ -150,11 +153,19 @@ pkg_postinst() {
einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
einfo
- if use apache2 ; then
- einfo
- einfo "The apache config value for \'ServerTokens\' must be set to at"
- einfo "least \'Min\'."
- einfo
+ if use apache2 ; then
+ einfo
+ einfo "apache config was installed into"
+ einfo "/etc/apache2/modules.d//99_icinga-web.conf"
+ einfo
+ einfo "The apache config value for \'ServerTokens\' must be set to at"
+ einfo "least \'Min\'."
+ einfo
+ else
+ einfo
+ einfo "If you are not using apache you may need to change some"
+ einfo "permissions, so that your web server can access files and logs"
+ einfo
fi
}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-07-16 14:58 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-07-16 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 383587a8e5e6ad43ca67e27a0b3b85af42d007f9
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Jul 16 14:58:09 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 14:58:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=383587a8
manifest...
---
net-analyzer/icinga-web/Manifest | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 9abb31a..f1faaa3 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,5 +1,4 @@
AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85
DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
-EBUILD icinga-web-1.7.1-r1.ebuild 4838 RMD160 2563e7663babe8a9ba26d9787566d860fadcda3b SHA1 b78fc5f399c7f5c1f01f6e226cd795477fe703fa SHA256 d40113fb19d7b6219db7810dc373d720caca1816b93ee8969b332679a1549c13
-EBUILD icinga-web-1.7.1-r2.ebuild 5038 RMD160 16a921f0514654b62830eae4d586b67b6d0017b0 SHA1 71ce8cdab51f21b1e50433a42c48d75fa8bff842 SHA256 be111f4f15624e9e91e29fab1e22bdcfc9196124eefd9e6e44f095534fbba034
+EBUILD icinga-web-1.7.1.ebuild 5711 RMD160 fb0e3bd4834a2e226c210889e463ad33394d8d15 SHA1 b0c10b579be253455ea1cf544cd2fac87b1f818d SHA256 abdaa504f32ba753cd0b6d6977fa7833b33bd99d1e4f3a70a3998316a1c96867
MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/
@ 2012-11-19 1:18 Matt Thode
0 siblings, 0 replies; 15+ messages in thread
From: Matt Thode @ 2012-11-19 1:18 UTC (permalink / raw
To: gentoo-commits
commit: 2f8048398876dc535f1e2cd081a6eb92da55797e
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Mon Nov 19 01:18:06 2012 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Nov 19 01:18:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/prometheanfire.git;a=commit;h=2f804839
testing icinga-web 1.8.0
---
net-analyzer/icinga-web/ChangeLog | 5 ++
net-analyzer/icinga-web/Manifest | 9 ++--
...ga-web-1.7.1.ebuild => icinga-web-1.8.0.ebuild} | 42 +++++++++----------
net-analyzer/icinga-web/metadata.xml | 10 +++++
4 files changed, 40 insertions(+), 26 deletions(-)
diff --git a/net-analyzer/icinga-web/ChangeLog b/net-analyzer/icinga-web/ChangeLog
index 716e172..64ab29b 100644
--- a/net-analyzer/icinga-web/ChangeLog
+++ b/net-analyzer/icinga-web/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*icinga-web-1.8.0 (19 Nov 2012)
+
+ 19 Nov 2012; <mthode@gentoo.org> +icinga-web-1.8.0.ebuild:
+ adding 1.8.0 for testing
+
*icinga-web-1.6.1-r1 (27 Feb 2012)
27 Feb 2012; mthode <mthode@gentoo.org> +icinga-web-1.6.1-r1.ebuild:
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index f1faaa3..01c68b0 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,4 +1,5 @@
-AUX icinga-web-1.7.1-disable-compression.patch 3120 RMD160 0d73c244fa69debc37be8dd6337b9b7d25269eb2 SHA1 9c84c5d2527bc959f92ece98af1322a9666a9c05 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85
-DIST icinga-web-1.7.1.tar.gz 14551987 RMD160 2a61a47ec493c2424d0093b4154f7e0758c633f2 SHA1 70ae4f2c6915ebc814d82ac9d1d3d57ddb0e2a49 SHA256 6b585f243ae247c6ca018d4a9dc3dc976209f5c489166643c0863fa9189d55ef
-EBUILD icinga-web-1.7.1.ebuild 5711 RMD160 fb0e3bd4834a2e226c210889e463ad33394d8d15 SHA1 b0c10b579be253455ea1cf544cd2fac87b1f818d SHA256 abdaa504f32ba753cd0b6d6977fa7833b33bd99d1e4f3a70a3998316a1c96867
-MISC ChangeLog 269 RMD160 50f58bfdece702df78994c9ca47add4a57ef3ae9 SHA1 7da37cb472aec84b463453c4360ffd5b157b19d5 SHA256 5b04c9b2c3510c6e759a3e16dc69304cf8b41cf093ec09a7d08bac9446da6df5
+AUX icinga-web-1.7.1-disable-compression.patch 3120 SHA256 5ac0b8cc757d474adc4e1bc8119facc0cda466f83a1e3ae88afb899de3bdea85 SHA512 09eccfe66bab2650e0146582511717ecd082139e0e29c95b9ebeccb37706a0a4c23f7c7a051561d65b77c749c7c6fbc3bf3ac0e1fcd405dff647400d23b44056 WHIRLPOOL 185e78e2b62c01d2867c476de329a077bbab77b29777acccd618016a3383a98879dd5b51c78bad47440f56b8497a2b1e10608a1a19466a0a80b6af5cf80f10de
+DIST icinga-web-1.8.0.tar.gz 14612975 SHA256 3e80a63fb15577c60f0b8228b7150897a7203361b2d3866a15d6a20492689398 SHA512 c2da9ec76aa634fb2e3e9018994bcd30892d9067875054f1f13fca35394d89a0c9429807a90fe519ac8896927e6899b2e7e16ae8047769491948c8bbe4ba2485 WHIRLPOOL 69eb3c4c49408ced0504b393163c10ffa678125af6a3e8b3eb4705bd12f3f7f22e0345ca361284ea0892b1d3193da3bf58fe78b6c9f20ce81aee7a7b0c8b6f76
+EBUILD icinga-web-1.8.0.ebuild 5002 SHA256 d3269d81f8da5b8f67f66916eef53869c5673e0315473223f58a5144530f916a SHA512 8555619e90ee1451f8f2734a0f6b7edda4f43bcc0ff49af331608863a2207094019c5f4c70cb16da97536f84a47ec98861ec26e4d3a5483bfcaeffca51321c35 WHIRLPOOL 1ed2c41a315d432e45faa620e5c2e34e62a118c0e0f398771b6e82af18551b3895408a863a8cb93053d9d40a6c0b64f19bfcdb23e0e5b54acc137a82e762e149
+MISC ChangeLog 391 SHA256 bac37c2e3a1f586c756b39862902341e1b3da1ea62f9594968465301d6609f75 SHA512 a6c5f928e63fd80b2f51ad5659db87269fe2a1382faa8438fca5f586a0c89b183ca131415e30338d82f3e482cf698da8b648a8ddd1ebb047e06b5ad852ffbd7d WHIRLPOOL 5a8007ef24a8d6b179c323d9bca717c1fb9c652fd71170c835db1e1b7d3c884c2377b703bdb06fb201178808c01a0536aed73f46c8a0c092ca45be9b7060eba6
+MISC metadata.xml 276 SHA256 7f7323b8d4eeb98e829b91b5b64d875bed129bed7a08c7734617321b62a2733d SHA512 4fcbbc83ea768710b30a7ca90029006511d070cceca7ada374775b664c4dc94f34ab905f90fb45d3d777c2f2551f00d9a9551b6a00a896513e9b9261c2607542 WHIRLPOOL bf5598ca6cb2398cab88dd3ad2af8962c9c42c70ed9e03528253ea11f5b3306c641f7aa3b20a802827e2199a3db2e5e5384ac886496bc55ae5ff83fc68400d09
diff --git a/net-analyzer/icinga-web/icinga-web-1.7.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.8.0.ebuild
similarity index 79%
rename from net-analyzer/icinga-web/icinga-web-1.7.1.ebuild
rename to net-analyzer/icinga-web/icinga-web-1.8.0.ebuild
index aee5a8b..182b998 100644
--- a/net-analyzer/icinga-web/icinga-web-1.7.1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="apache2 mysql pnp postgres"
DEPEND="dev-php/phing
- dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
+ dev-lang/php[apache2?,cli,mysql?,pdo,postgres?,json]
pnp? ( net-analyzer/pnp4nagios )"
RDEPEND="${DEPEND}"
@@ -24,8 +24,8 @@ pkg_setup() {
if use apache2 ; then
depend.apache_pkg_setup
fi
- enewgroup icinga
- enewgroup nagios
+ enewgroup icinga
+ enewgroup nagios
enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
}
@@ -82,7 +82,7 @@ src_install() {
if use apache2 ; then
dodir ${APACHE_MODULES_CONFDIR}
emake -j1 DESTDIR="${D}" install-apache-config || die "make failed"
- mv ${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf ${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf
+ mv "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
fi
insinto /usr/share/icinga/icinga-web/contrib
@@ -111,7 +111,6 @@ src_install() {
fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
fi
-
if use pnp ; then
insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
@@ -131,11 +130,11 @@ pkg_postinst() {
einfo " echo \"CREATE DATABASE icinga_web;\" | mysql"
einfo " echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
einfo " echo \"FLUSH PRIVILEGES;\" | mysql"
- einfo
+ einfo
einfo " cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
einfo
- ewarn
+ ewarn
ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
ewarn
@@ -153,19 +152,18 @@ pkg_postinst() {
einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
einfo
- if use apache2 ; then
- einfo
- einfo "apache config was installed into"
- einfo "/etc/apache2/modules.d//99_icinga-web.conf"
- einfo
- einfo "The apache config value for \'ServerTokens\' must be set to at"
- einfo "least \'Min\'."
- einfo
- else
- einfo
- einfo "If you are not using apache you may need to change some"
- einfo "permissions, so that your web server can access files and logs"
- einfo
+ if use apache2 ; then
+ einfo
+ einfo "apache config was installed into"
+ einfo "/etc/apache2/modules.d//99_icinga-web.conf"
+ einfo
+ einfo "The apache config value for \'ServerTokens\' must be set to at"
+ einfo "least \'Min\'."
+ einfo
+ else
+ einfo
+ einfo "If you are not using apache you may need to change some"
+ einfo "permissions, so that your web server can access files and logs"
+ einfo
fi
}
-
diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
new file mode 100644
index 0000000..75579a0
--- /dev/null
+++ b/net-analyzer/icinga-web/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <use>
+ <flag name="pnp">Enables pnp4nagios integration</flag>
+ </use>
+ <longdescription lang="en">
+ </longdescription>
+</pkgmetadata>
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2012-11-19 1:18 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-12 18:00 [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga-web/ Matt Thode
-- strict thread matches above, loose matches on Subject: below --
2012-11-19 1:18 Matt Thode
2012-07-16 14:58 Matt Thode
2012-07-16 14:58 Matt Thode
2012-07-13 16:13 Matt Thode
2012-07-12 18:00 Matt Thode
2012-07-11 20:04 Matt Thode
2012-07-11 19:38 Matt Thode
2012-07-11 18:56 Matt Thode
2012-07-11 18:43 Matt Thode
2012-07-11 15:23 Matt Thode
2012-02-28 2:30 Matt Thode
2012-02-28 2:19 Matt Thode
2012-02-28 1:59 Matt Thode
2012-02-27 22:01 Matt Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox