From 1e4ef4ca8003533cb6a45c85a59fb83a28a306ed Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Fri, 13 Aug 2010 21:26:31 +0000 Subject: net-analyzer/ icinga-core: Remove icingia-core, missing prior review svn path=/sunrise/; revision=11135 --- net-analyzer/icinga-core/ChangeLog | 11 - net-analyzer/icinga-core/Manifest | 10 - net-analyzer/icinga-core/files/icinga-apache.conf | 15 -- net-analyzer/icinga-core/files/icinga-conf.d | 10 - net-analyzer/icinga-core/files/icinga-init.d | 57 ----- net-analyzer/icinga-core/files/icinga-lighty.conf | 24 --- net-analyzer/icinga-core/files/ido2db-conf.d | 1 - net-analyzer/icinga-core/files/ido2db-init.d | 24 --- net-analyzer/icinga-core/icinga-core-1.0.2.ebuild | 242 ---------------------- net-analyzer/icinga-core/metadata.xml | 17 -- 10 files changed, 411 deletions(-) delete mode 100644 net-analyzer/icinga-core/ChangeLog delete mode 100755 net-analyzer/icinga-core/Manifest delete mode 100644 net-analyzer/icinga-core/files/icinga-apache.conf delete mode 100644 net-analyzer/icinga-core/files/icinga-conf.d delete mode 100644 net-analyzer/icinga-core/files/icinga-init.d delete mode 100644 net-analyzer/icinga-core/files/icinga-lighty.conf delete mode 100644 net-analyzer/icinga-core/files/ido2db-conf.d delete mode 100644 net-analyzer/icinga-core/files/ido2db-init.d delete mode 100644 net-analyzer/icinga-core/icinga-core-1.0.2.ebuild delete mode 100644 net-analyzer/icinga-core/metadata.xml (limited to 'net-analyzer') diff --git a/net-analyzer/icinga-core/ChangeLog b/net-analyzer/icinga-core/ChangeLog deleted file mode 100644 index 6668fc389..000000000 --- a/net-analyzer/icinga-core/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -# ChangeLog for net-analyzer/icinga-core -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 11 Aug 2010; mthode +icinga-core-1.0.2.ebuild, - +files/icinga-apache.conf, +files/icinga-conf.d, +files/icinga-init.d, - +files/icinga-lighty.conf, +files/ido2db-conf.d, +files/ido2db-init.d, - +metadata.xml: - package split into metapackages, icinga becoming the master, pulling in - icinga-core. Thanks to RedPepper for the ebuild. - diff --git a/net-analyzer/icinga-core/Manifest b/net-analyzer/icinga-core/Manifest deleted file mode 100755 index 99a262db7..000000000 --- a/net-analyzer/icinga-core/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX icinga-apache.conf 377 RMD160 bd009d51035802deb5efd3aaf0b726ca7ef34e2e SHA1 7ba572b8ed52695a8278cc5d57df3fd8cf59dca8 SHA256 e2a17742d8a74f31fd038cbf33533ccdeaed8604cfa026d0fdbb24d3a46e30f9 -AUX icinga-conf.d 409 RMD160 02133c6fc46e24cf99f517b15879ba0a002e36cf SHA1 91b5b200be4c6d6f8d6691e002c5456845f1cc52 SHA256 98485e5a3ec4e32ec800aee6fe695c4740287791e59d7b7426bb2378b21e8d46 -AUX icinga-init.d 1441 RMD160 7b2d9b472dde57c51e1e88c5b23078b3eb4bf05d SHA1 31583c8028c67fbd6e9a345bbc9977ab80b19508 SHA256 914c1c94f54913e7ebf26e64e82ef243a6b1669a2e475e50183b7b7425f41a64 -AUX icinga-lighty.conf 482 RMD160 8e95335db2126f3d95492e32b83eb275e9c30066 SHA1 c0eb082d8c3030059e0d63527ee1c8a3df535478 SHA256 18f865b1fe89c92594165bd065739c94c8c4738647f5d32d7baceb894d7f6b38 -AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 -AUX ido2db-init.d 490 RMD160 aefba82dcc3fc5b5e57e41aa7a3193a613a47795 SHA1 5b2995c3c5eaf299a22e2e6ece25b1cd475b27d1 SHA256 185090c65b31e608b7fd217ca0ebc8e503ffb8864780192119820cbef834d93f -DIST icinga-1.0.2.tar.gz 8446607 RMD160 782ebbad8ce4e88a3e214ba12802fe7d968ce851 SHA1 d4325b87369d9bbfc1d52da071e8cc24bdc3d2dd SHA256 3e827712cef7afd074048e5bf48140744c2bdd9607235997e947d1eb8c7665c4 -EBUILD icinga-core-1.0.2.ebuild 7237 RMD160 ff827d410d762c02506875b74340a09bf2eb4054 SHA1 2150a841d6e611355fe17d12303c4c666b7badd3 SHA256 21b1c898825ccef026b4704e33921875e49ef3f8211633a278f5cff4034d298c -MISC ChangeLog 483 RMD160 4d62a9617a697b0b6e561759840f553c044aecef SHA1 4615bdc7865851229fa1c7000409694788355178 SHA256 8a886b14621ed50ff651e47a71c01665a7b02e95ed7d2e5015838dca52068afa -MISC metadata.xml 678 RMD160 65d4aa9b1bcce116998ab4062c640d4b9a08caa5 SHA1 bc967460fb01357ff90950e4ea083dae226f9c95 SHA256 8f2aebcf0a6ecf8f7c344020534cbeedfdb6c325f6d99c2647c6053e70382536 diff --git a/net-analyzer/icinga-core/files/icinga-apache.conf b/net-analyzer/icinga-core/files/icinga-apache.conf deleted file mode 100644 index e1a0199fe..000000000 --- a/net-analyzer/icinga-core/files/icinga-apache.conf +++ /dev/null @@ -1,15 +0,0 @@ - - ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/ - - AllowOverride AuthConfig - Options ExecCGI - Order allow,deny - Allow from all - - Alias /icinga /usr/share/icinga/htdocs - - AllowOverride AuthConfig - Order allow,deny - Allow from all - - diff --git a/net-analyzer/icinga-core/files/icinga-conf.d b/net-analyzer/icinga-core/files/icinga-conf.d deleted file mode 100644 index 84642cdd9..000000000 --- a/net-analyzer/icinga-core/files/icinga-conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/files/conf.d,v 1.1 2004/08/20 13:38:13 eldad Exp $ - -# Distributed monitoring users will want to configure here the ip/hostname of the central server. -# It will be used by submit_check_result_via_nsca. -NAGIOS_NSCA_HOST="localhost" - - - diff --git a/net-analyzer/icinga-core/files/icinga-init.d b/net-analyzer/icinga-core/files/icinga-init.d deleted file mode 100644 index 627cc5066..000000000 --- a/net-analyzer/icinga-core/files/icinga-init.d +++ /dev/null @@ -1,57 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/files/icinga3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $ - -opts="${opts} reload checkconfig" - -depend() { - need net - use dns logger firewall - after mysql postgresql -} - -reload() -{ - checkconfig || return 1 - ebegin "Reloading configuration" - killall -HUP icinga &>/dev/null - eend $? -} - -checkconfig() { - # Silent Check - /usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0 - - # Now we know there's problem - run again and display errors - /usr/sbin/icinga -v /etc/icinga/icinga.cfg - eend $? "Configuration Error. Please fix your configfile" -} - -start() { - checkconfig || return 1 - ebegin "Starting icinga" - touch /var/icinga/icinga.log /var/icinga/status.sav - chown icinga:icinga /var/icinga/icinga.log /var/icinga/status.sav - rm -f /var/icinga/rw/icinga.cmd - start-stop-daemon --quiet --start --startas /usr/sbin/icinga \ - -e HOME="/var/icinga/home" --pidfile /var/icinga/icinga.lock \ - -- -d /etc/icinga/icinga.cfg - eend $? -} - -stop() { - ebegin "Stopping icinga" - start-stop-daemon --quiet --stop --pidfile /var/icinga/icinga.lock - rm -f /var/icinga/status.log /var/icinga/icinga.tmp /var/icinga/icinga.lock /var/icinga/rw/icinga.cmd - eend $? -} - -svc_restart() { - checkconfig || return 1 - ebegin "Restarting icinga" - svc_stop - svc_start - eend $? -} - diff --git a/net-analyzer/icinga-core/files/icinga-lighty.conf b/net-analyzer/icinga-core/files/icinga-lighty.conf deleted file mode 100644 index 227189d4d..000000000 --- a/net-analyzer/icinga-core/files/icinga-lighty.conf +++ /dev/null @@ -1,24 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_auth") -server.modules += ("mod_alias") - -auth.require += ( "/icinga" => - ( - "method" => "digest", - "realm" => "icinga", - "require" => "valid-user" - ) -) - -$HTTP["url"] =~ "^/icinga/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin", - "/icinga" => "/usr/share/icinga/htdocs" -) diff --git a/net-analyzer/icinga-core/files/ido2db-conf.d b/net-analyzer/icinga-core/files/ido2db-conf.d deleted file mode 100644 index 5429fa9a5..000000000 --- a/net-analyzer/icinga-core/files/ido2db-conf.d +++ /dev/null @@ -1 +0,0 @@ -IDO2DBCFG="/etc/icinga/ido2db.cfg" diff --git a/net-analyzer/icinga-core/files/ido2db-init.d b/net-analyzer/icinga-core/files/ido2db-init.d deleted file mode 100644 index d9662910a..000000000 --- a/net-analyzer/icinga-core/files/ido2db-init.d +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -IDO2DBBIN="/usr/sbin/ido2db" - -depend() { - need net - use dns logger firewall - after mysql postgresql -} - -start() { - ebegin "Starting ido2db" - start-stop-daemon --quiet --start ${IDO2DBBIN} -- -c ${IDO2DBCFG} - eend $? -} - -stop() { - ebegin "Stopping ido2db" - start-stop-daemon --quiet --stop ${IDO2DBBIN} -- -c ${IDO2DBCFG} - eend $? -} diff --git a/net-analyzer/icinga-core/icinga-core-1.0.2.ebuild b/net-analyzer/icinga-core/icinga-core-1.0.2.ebuild deleted file mode 100644 index aefc2738a..000000000 --- a/net-analyzer/icinga-core/icinga-core-1.0.2.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/icinga-core-3.1.0.ebuild,v 1.3 2009/02/24 17:07:42 dertobi123 Exp $ - -EAPI="2" - -inherit eutils depend.apache toolchain-funcs - -SRC_URI="mirror://sourceforge/icinga/icinga-${PV}.tar.gz" -DESCRIPTION="Icinga - Check daemon, CGIs, docs, IDOutils" -HOMEPAGE="http://www.icinga.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+apache2 api debug +idoutils lighttpd perl plugins +vim-syntax +web" -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql] ) - perl? ( >=dev-lang/perl-5.6.1-r7 ) - virtual/mailx - web? ( - >=media-libs/gd-1.8.3-r5[jpeg,png] - lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] ) - apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) ) - ) - !net-analyzer/nagios-core" -RDEPEND="${DEPEND} - plugins? ( net-analyzer/nagios-plugins ) - vim-syntax? ( app-vim/nagios-syntax )" - -want_apache2 - -pkg_setup() { - enewgroup icinga - enewuser icinga -1 /bin/bash /var/spool/icinga icinga -} - -src_prepare() { - local strip="$(echo '$(MAKE) strip-post-install')" - sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in - Makefile.in" - if use api ; then - sed -i -e 's/USE_ICINGAAPI=no/USE_ICINGAAPI=yes/g' Makefile.in - fi -} - -src_configure() { - local myconf - - if use perl ; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - myconf="${myconf} --disable-statuswrl $(use_enable idoutils)" - - if use debug; then - myconf="${myconf} --enable-DEBUG0" - myconf="${myconf} --enable-DEBUG1" - myconf="${myconf} --enable-DEBUG2" - myconf="${myconf} --enable-DEBUG3" - myconf="${myconf} --enable-DEBUG4" - myconf="${myconf} --enable-DEBUG5" - fi - - if use !apache2 && use !lighttpd ; then - myconf="${myconf} --with-command-group=icinga" - else - if use apache2 ; then - myconf="${myconf} --with-command-group=apache" - myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" - elif use lighttpd ; then - myconf="${myconf} --with-command-group=lighttpd" - fi - fi - - econf ${myconf} \ - --prefix=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin \ - --datarootdir=/usr/share/icinga/htdocs \ - --localstatedir=/var/icinga \ - --sysconfdir=/etc/icinga \ - --libexecdir=/usr/$(get_libdir)/icinga/plugins \ - || die "./configure failed" - if use api ; then - sed -i -e 's/USE_ICINGAAPI=no/USE_ICINGAAPI=yes/g' Makefile - fi - if use api ; then - cd module/icinga-api - econf --prefix=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin \ - --datarootdir=/usr/share/icinga/htdocs \ - --localstatedir=/var/icinga \ - --sysconfdir=/etc/icinga \ - --libexecdir=/usr/$(get_libdir)/icinga/plugins \ - || die "./configure failed" - fi -} - -src_compile() { - - emake CC=$(tc-getCC) icinga || die "make failed" - - if use web ; then - # Only compile the CGI's if "web" useflag is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die - fi - - if use idoutils ; then - # Only compile IDOUtils if "idoutils" useflag is set. - emake CC=$(tc-getCC) DESTDIR="${D}" idoutils || die - fi -} - -src_install() { - dodoc Changelog INSTALLING LEGAL README UPGRADING - - if ! use web ; then - sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \ - -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \ - Makefile - fi - sed -i -e 's/^contactgroups$//g' Makefile - - emake DESTDIR="${D}" install - emake DESTDIR="${D}" install-config - emake DESTDIR="${D}" install-commandmode - - if use idoutils ; then - emake DESTDIR="${D}" install-idoutils - fi - if use api ; then - emake DESTDIR="${D}" install-api - fi - - newinitd "${FILESDIR}"/icinga-init.d icinga - newconfd "${FILESDIR}"/icinga-conf.d icinga - if use idoutils ; then - newinitd "${FILESDIR}"/ido2db-init.d ido2db - newconfd "${FILESDIR}"/ido2db-conf.d ido2db - mkdir -p "${D}"/usr/share/icinga/contrib/db - cp -r "${S}"/module/idoutils/db/* "${D}"/usr/share/icinga/contrib/db/ - fi - # Apache Module - if use web ; then - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf - elif use lighttpd ; then - insinto /etc/lighttpd - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf - else - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" - ewarn "out-of-the-box. Since you are not using one of them, you" - ewarn "have to configure your webserver accordingly yourself." - fi - - fi - - for dir in etc/icinga var/icinga ; do - chown -R icinga:icinga "${D}/${dir}" || die "Failed chown of ${D}/${dir}" - done - - chown -R root:root "${D}"/usr/$(get_libdir)/icinga - find "${D}"/usr/$(get_libdir)/icinga -type d -print0 | xargs -0 chmod 755 - find "${D}"/usr/$(get_libdir)/icinga/cgi-bin -type f -print0 | xargs -0 chmod 755 - - keepdir /etc/icinga - keepdir /var/icinga - keepdir /var/icinga/archives - keepdir /var/icinga/rw - keepdir /var/icinga/spool/checkresults - - if use !apache2 && use !lighttpd; then - chown -R icinga:icinga "${D}"/var/icinga/rw || die "Failed chown of ${D}/var/icinga/rw" - else - if use apache2 ; then - chown -R icinga:apache "${D}"/var/icinga/rw || die "Failed chown of ${D}/var/icinga/rw" - elif use lighttpd ; then - chown -R icinga:lighttpd "${D}"/var/icinga/rw || die "Failed chown of ${D}/var/icinga/rw" - fi - fi - - chmod ug+s "${D}"/var/icinga/rw || die "Failed Chmod of ${D}/var/icinga/rw" - chmod 0750 "${D}"/etc/icinga || die "Failed chmod of ${D}/etc/icinga" -} - -pkg_postinst() { - elog "If you want icinga to start at boot time" - elog "remember to execute:" - elog " rc-update add icinga default" - elog - - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "To have ministatus.cgi requires copying of ministatus.c" - elog "to cgi directory for compiling." - - elog "Note that the user your webserver is running at needs" - elog "read-access to /etc/icinga." - elog - - if use apache2 || use lighttpd ; then - elog "There are several possible solutions to accomplish this," - elog "choose the one you are most comfortable with:" - elog - if use apache2 ; then - elog " usermod -G icinga apache" - elog "or" - elog " chown icinga:apache /etc/icinga" - elog - elog "Also edit /etc/conf.d/apache2 and add \"-D ICINGA\"" - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - fi - elog - elog "That will make icinga's web front end visable via" - elog "http://localhost/icinga/" - elog - else - elog "IMPORTANT: Do not forget to add the user your webserver" - elog "is running as to the icinga group!" - fi - - else - elog "Please note that you have installed Icinga without web interface." - elog "Please don't file any bugs about having no web interface when you do this." - elog "Thank you!" - fi - - elog - elog "If your kernel has /proc protection, icinga" - elog "will not be happy as it relies on accessing the proc" - elog "filesystem. You can fix this by adding icinga into" - elog "the group wheel, but this is not recomended." - elog - einfo "Fixing permissions" - chown icinga:icinga "${ROOT}"var/icinga -} diff --git a/net-analyzer/icinga-core/metadata.xml b/net-analyzer/icinga-core/metadata.xml deleted file mode 100644 index 9c5d3e522..000000000 --- a/net-analyzer/icinga-core/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - no-herd - A rebuild of nagios from the ground up - - maintainer-wanted@gentoo.org - - - integrates the icinga api - allows for database support - allows for lighttpd to be used as a web front end - allows the use of nagios plugins - allows for a web frontend to be built (lighttpd or apache2) - - - -- cgit v1.2.3-65-gdbad