From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RUOA9-0003fG-JE for garchives@archives.gentoo.org; Sat, 26 Nov 2011 19:43:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F24FD21C04B; Sat, 26 Nov 2011 19:43:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AA53421C04B for ; Sat, 26 Nov 2011 19:43:41 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F1B11B4027 for ; Sat, 26 Nov 2011 19:43:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 352B380042 for ; Sat, 26 Nov 2011 19:43:40 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1816499d0ed405271284115d6f5af43dd18a0bfd.prometheanfire@gentoo> Subject: [gentoo-commits] dev/prometheanfire:master commit in: net-analyzer/icinga/ X-VCS-Repository: dev/prometheanfire X-VCS-Files: net-analyzer/icinga/icinga-1.6.0_beta.ebuild X-VCS-Directories: net-analyzer/icinga/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 1816499d0ed405271284115d6f5af43dd18a0bfd Date: Sat, 26 Nov 2011 19:43:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: aa31f1e1-e630-4899-9cb0-c7d6c44bc78c X-Archives-Hash: 618e3c40fb2deeb9abec12690beba117 commit: 1816499d0ed405271284115d6f5af43dd18a0bfd Author: Matthew Thode gentoo org> AuthorDate: Sat Nov 26 19:43:14 2011 +0000 Commit: Matt Thode gentoo org> CommitDate: Sat Nov 26 19:43:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/prometheanfire= .git;a=3Dcommit;h=3D1816499d changed elog location for the web stuff --- net-analyzer/icinga/icinga-1.6.0_beta.ebuild | 85 +++++++++++++-------= ------ 1 files changed, 42 insertions(+), 43 deletions(-) diff --git a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild b/net-analyzer/= icinga/icinga-1.6.0_beta.ebuild index 0b89bea..a10a613 100644 --- a/net-analyzer/icinga/icinga-1.6.0_beta.ebuild +++ b/net-analyzer/icinga/icinga-1.6.0_beta.ebuild @@ -38,49 +38,6 @@ pkg_setup() { enewgroup icinga enewgroup nagios enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios" - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "Note that the user your webserver is running as 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\"" - elog - elog "Icinga web service needs user authentication. If you" - elog "use the base configuration, you need a password file" - elog "with a password for user \"icingaadmin\"" - elog "You can create this file by executing:" - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"light= tpd_icinga.conf\"'" - 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 - ewarn "Please note that you have installed Icinga without web interfac= e." - ewarn "Please don't file any bugs about having no web interface when y= ou do this." - ewarn "Thank you!" - fi - } =20 src_prepare() { @@ -212,6 +169,48 @@ src_install() { } =20 pkg_postinst() { + if use web ; then + elog "This does not include cgis that are perl-dependent" + elog "Currently traceroute.cgi is perl-dependent" + elog "Note that the user your webserver is running as 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\"" + elog + elog "Icinga web service needs user authentication. If you" + elog "use the base configuration, you need a password file" + elog "with a password for user \"icingaadmin\"" + elog "You can create this file by executing:" + elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" + elif use lighttpd ; then + elog " usermod -G icinga lighttpd " + elog "or" + elog " chown icinga:lighttpd /etc/icinga" + elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"light= tpd_icinga.conf\"'" + 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 + ewarn "Please note that you have installed Icinga without web interfac= e." + ewarn "Please don't file any bugs about having no web interface when y= ou do this." + ewarn "Thank you!" + fi + elog elog "If you want icinga to start at boot time" elog "remember to execute:" elog " rc-update add icinga default"