public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Matt Thode" <prometheanfire@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/
Date: Tue, 11 Oct 2016 18:14:53 +0000 (UTC)	[thread overview]
Message-ID: <1476209657.b6288f904b64ec7dac4eca9a4311d4f0a11f1d18.prometheanfire@gentoo> (raw)

commit:     b6288f904b64ec7dac4eca9a4311d4f0a11f1d18
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 18:13:27 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 18:14:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6288f90

net-analyzer/icinga-web: cleanup

Package-Manager: portage-2.3.0

 net-analyzer/icinga-web/Manifest                   |   3 -
 .../icinga-web/icinga-web-1.10.0-r1.ebuild         | 206 ---------------------
 net-analyzer/icinga-web/icinga-web-1.10.0.ebuild   | 206 ---------------------
 net-analyzer/icinga-web/icinga-web-1.10.1.ebuild   | 206 ---------------------
 net-analyzer/icinga-web/icinga-web-1.9.1-r1.ebuild | 203 --------------------
 5 files changed, 824 deletions(-)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 935b9fd..3b690ec 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,5 +1,2 @@
-DIST icinga-web-1.10.0.tar.gz 14245635 SHA256 fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512 90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368 WHIRLPOOL c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc
-DIST icinga-web-1.10.1.tar.gz 14247394 SHA256 b334c063cf4f53fcc1922d99161b5ea5c32c04749c0f9dfe091f376158273664 SHA512 e155c4c00fde20680ed3286fbf7af4db13dd566693ec677a61c719cf8a0b36862bc51741180aceba204e6f768000d8a6dc4548bfbf7165f28f8bbc81c79bc63c WHIRLPOOL d4cf2ea128c0e46bf07ce1ae677a4e718405b926250f4972790388d2b45cef5996e16ca5b83dcdd8f8c9a84831a76cb88b76d0839bdce87e222d6712463b6de9
 DIST icinga-web-1.11.2.tar.gz 14133733 SHA256 726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512 ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1 WHIRLPOOL bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
 DIST icinga-web-1.12.0.tar.gz 14517225 SHA256 3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512 07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898 WHIRLPOOL 85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
-DIST icinga-web-1.9.1.tar.gz 14635896 SHA256 aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512 42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9 WHIRLPOOL 8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257

diff --git a/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
deleted file mode 100644
index 99c69cc..00000000
--- a/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-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-db/libdbi-drivers[mysql?,postgres?]
-		>=net-analyzer/icinga-1.10.0
-		dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-		pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	if use apache2 ; then
-		depend.apache_pkg_setup
-	fi
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	#removed checks for some php stuff since we have these things called use flags
-	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
-	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-	autoreconf
-}
-
-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=${APACHE_MODULES_CONFDIR}"
-	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
-
-	emake DESTDIR="${D}" install-javascript
-
-	if use apache2 ; then
-		dodir ${APACHE_MODULES_CONFDIR}
-		emake DESTDIR="${D}" install-apache-config
-		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed"
-		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-	fi
-
-	insinto /usr/share/icinga/icinga-web/contrib
-	doins -r etc/schema/*
-
-	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
-
-	dodir /usr/share/icinga/icinga-web/cron/
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-#mail to root
-MAILTO=root
-
-#runs every minute
-* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
-# Mail reports to root
-!mailto(root)
-
-#runs every minute
-@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	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_config() {
-	einfo "press enter to install the icinga-web crontab"
-	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
-	einfo
-	read
-
-	if has_version sys-process/fcron; then
-		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
-	else
-		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
-	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.10.0.ebuild b/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild
deleted file mode 100644
index 95e895b..00000000
--- a/net-analyzer/icinga-web/icinga-web-1.10.0.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-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-db/libdbi-drivers[mysql?,postgres?]
-		>=net-analyzer/icinga-1.10.0
-		dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-		pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	if use apache2 ; then
-		depend.apache_pkg_setup
-	fi
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	#removed checks for some php stuff since we have these things called use flags
-	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
-	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-	autoreconf
-}
-
-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=${APACHE_MODULES_CONFDIR}"
-	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 -j5 DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" install-javascript
-
-	if use apache2 ; then
-		dodir ${APACHE_MODULES_CONFDIR}
-		emake DESTDIR="${D}" install-apache-config
-		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed"
-		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-	fi
-
-	insinto /usr/share/icinga/icinga-web/contrib
-	doins -r etc/schema/*
-
-	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
-
-	dodir /usr/share/icinga/icinga-web/cron/
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-#mail to root
-MAILTO=root
-
-#runs every minute
-* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
-# Mail reports to root
-!mailto(root)
-
-#runs every minute
-@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	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_config() {
-	einfo "press enter to install the icinga-web crontab"
-	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
-	einfo
-	read
-
-	if has_version sys-process/fcron; then
-		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
-	else
-		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
-	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.10.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.10.1.ebuild
deleted file mode 100644
index 9dc6090..00000000
--- a/net-analyzer/icinga-web/icinga-web-1.10.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://github.com/icinga/${PN}/releases/download/v${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
-		dev-db/libdbi-drivers[mysql?,postgres?]
-		>=net-analyzer/icinga-1.10.0
-		dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-		pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	if use apache2 ; then
-		depend.apache_pkg_setup
-	fi
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	#removed checks for some php stuff since we have these things called use flags
-	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
-	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-	autoreconf
-}
-
-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=${APACHE_MODULES_CONFDIR}"
-	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
-
-	emake DESTDIR="${D}" install-javascript
-
-	if use apache2 ; then
-		dodir ${APACHE_MODULES_CONFDIR}
-		emake DESTDIR="${D}" install-apache-config
-		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed"
-		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-	fi
-
-	insinto /usr/share/icinga/icinga-web/contrib
-	doins -r etc/schema/*
-
-	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
-
-	dodir /usr/share/icinga/icinga-web/cron/
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-#mail to root
-MAILTO=root
-
-#runs every minute
-* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
-# Mail reports to root
-!mailto(root)
-
-#runs every minute
-@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	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_config() {
-	einfo "press enter to install the icinga-web crontab"
-	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
-	einfo
-	read
-
-	if has_version sys-process/fcron; then
-		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
-	else
-		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
-	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.9.1-r1.ebuild b/net-analyzer/icinga-web/icinga-web-1.9.1-r1.ebuild
deleted file mode 100644
index 1279d32..00000000
--- a/net-analyzer/icinga-web/icinga-web-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-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,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-		pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	if use apache2 ; then
-		depend.apache_pkg_setup
-	fi
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	#removed checks for some php stuff since we have these things called use flags
-	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
-	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-	autoreconf
-}
-
-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=${APACHE_MODULES_CONFDIR}"
-	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 DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" install-javascript
-
-	if use apache2 ; then
-		dodir ${APACHE_MODULES_CONFDIR}
-		emake DESTDIR="${D}" install-apache-config
-		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		cat "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-	fi
-
-	insinto /usr/share/icinga/icinga-web/contrib
-	doins -r etc/schema/*
-
-	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
-
-	dodir /usr/share/icinga/icinga-web/cron/
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-#mail to root
-MAILTO=root
-
-#runs every minute
-* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
-# Mail reports to root
-!mailto(root)
-
-#runs every minute
-@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	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_config() {
-	einfo "press enter to install the icinga-web crontab"
-	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
-	einfo
-	read
-
-	if has_version sys-process/fcron; then
-		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
-	else
-		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
-	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
-}


             reply	other threads:[~2016-10-11 18:15 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-11 18:14 Matt Thode [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-10-11 18:14 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/ Matt Thode
2016-12-23  3:18 Matt Thode
2016-12-23  3:18 Matt Thode
2017-12-20 23:44 Matt Thode
2018-01-19 17:25 Matt Thode

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1476209657.b6288f904b64ec7dac4eca9a4311d4f0a11f1d18.prometheanfire@gentoo \
    --to=prometheanfire@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox