Small bugfixes, username/group addition fix.

6 files changed, 139 insertions, 5 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index e24d824c29f4..66aaa5227598 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.9 2003/06/10 21:12:44 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.10 2003/06/17 20:15:39 alron Exp $
 
+*nagios-core-1.1-r1	(17 Jun 2003)
+  17 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1-r1 :
+  Another small fix for install time user/group addition. Fix for bug
+  #16175
+  
 *nagios-core-1.1	(10 Jun 2003)
   10 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1 :
   Version bump with small patches added in. Apache2 useflag support
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 59fdfb60370e..a015ec990156 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,9 +1,9 @@
-MD5 4ea836c9b60b36629cc1dae91af7e016 ChangeLog 1745
+MD5 c19efd18fbb66aa2fd8c9a31522999bb ChangeLog 1746
 MD5 e2a795a1bd70384453e0d11c489eb3ea nagios-core-1.0-r1.ebuild 2966
 MD5 0fa8e6f2af26789977fb287e11323398 nagios-core-1.0.ebuild 2905
 MD5 57b7f1e4322ca6f6af883502c8c6cdba nagios-core-1.0_beta6.ebuild 2932
 MD5 d0114ab8e5906b8e85e3a7c1a7d7ae38 nagios-core-1.1.ebuild 3742
-MD5 c7452507dc9d73b3bb98399c513bf84e nagios-core-1.1-r1.ebuild 4083
+MD5 f634560933ba27f724c0336c11e57ea7 nagios-core-1.1-r1.ebuild 4086
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 ed55f5423b9d57494d8ddc7dcaeceaf3 files/digest-nagios-core-1.0 63
diff --git a/net-analyzer/nagios-core/files/99_nagios.conf b/net-analyzer/nagios-core/files/99_nagios.conf
index 95112117055b..b41cdeed9385 100644
--- a/net-analyzer/nagios-core/files/99_nagios.conf
+++ b/net-analyzer/nagios-core/files/99_nagios.conf
@@ -6,7 +6,7 @@
 		Order allow,deny
 		Allow from all
 	</Directory>
-	Alias /nagios/ /usr/nagios/share/
+	Alias /nagios /usr/nagios/share/
 	<Directory "/usr/nagios/share">
 		AllowOverride AuthConfig
 		Order allow,deny
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r1 b/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r1
new file mode 100644
index 000000000000..14267bedc75b
--- /dev/null
+++ b/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r1
@@ -0,0 +1 @@
+MD5 5f48ecd9bad2c4d7c9d88d0b6f347ecf nagios-1.1.tar.gz 1619888
diff --git a/net-analyzer/nagios-core/files/nagios.conf b/net-analyzer/nagios-core/files/nagios.conf
index e26cffda3737..76abed125c24 100644
--- a/net-analyzer/nagios-core/files/nagios.conf
+++ b/net-analyzer/nagios-core/files/nagios.conf
@@ -9,7 +9,7 @@ ScriptAlias /nagios/cgi-bin/ /usr/nagios/sbin/
 </Directory>
 
 
-Alias /nagios/ /usr/nagios/share/
+Alias /nagios /usr/nagios/share/
 <Directory "/usr/nagios/share">
     AllowOverride AuthConfig
     Order allow,deny
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild
new file mode 100644
index 000000000000..b289fe5cc39a
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild,v 1.1 2003/06/17 20:15:39 alron Exp $
+inherit eutils
+
+DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
+HOMEPAGE="http://www.nagios.org/"
+SRC_URI="mirror://sourceforge/nagios/nagios-1.1.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE="apache2"
+DEPEND=">=jpeg-6b-r2
+		>=libpng-1.2.4
+		>=libgd-1.8.3-r5
+		>=perl-5.6.1-r7
+		>=traceroute-1.4_p12
+		>=mailx-8.1
+		|| (
+		>=apache-1.3.27-r1
+		apache2 ( >=net-www/apache-2.0.43-r1 )
+		)"
+S="${WORKDIR}/nagios-1.1"
+pkg_setup() {
+	enewgroup nagios 
+	enewuser nagios -1 /bin/bash /dev/null nagios
+	# Old Style removed because of eutils class
+	#userdel nagios 2> /dev/null
+	#if ! groupmod nagios; then
+	#	groupadd -g 75 nagios 2> /dev/null || \
+	#		die "Failed to create nagios group"
+	#fi
+	#useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
+	#	die "Failed to create nagios user"
+}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	bzcat ${FILESDIR}/Makefile-distclean.diff.bz2 | patch -p1
+	bzcat ${FILESDIR}/tac.cgi.diff.bz2 | patch -p1
+}
+src_compile() {
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr/nagios \
+		--localstatedir=/var/nagios \
+		--sysconfdir=/etc/nagios \
+		--enable-embedded-perl \
+		--with-perlcache \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man || die "./configure failed"
+	emake all || die
+}
+
+src_install() {
+	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
+#	make DESTDIR=${D} COMMAND_OPTS="" INSTALL_OPTS="" install install-config install-commandmode || die
+	make DESTDIR=${D} install install-config install-commandmode || die
+	if [ "`use apache2`" ] ; then
+		insinto /etc/apache2/conf/modules.d
+		doins ${FILESDIR}/99_nagios.conf
+	else
+		insinto /etc/apache/conf/addon-modules
+		doins ${FILESDIR}/nagios.conf
+	fi
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/nagios
+	insinto /etc/nagios
+	doins ${FILESDIR}/nagios.cfg-sample
+}
+pkg_preinst() {
+	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
+	touch ${D}/usr/nagios/share/ssi/.keep
+	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
+	touch ${D}/var/nagios/.keep
+	touch ${D}/var/nagios/archives/.keep
+	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
+	touch ${D}/var/nagios/rw/.keep
+	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
+}
+pkg_postinst() {
+	einfo 
+	einfo "Remember to edit the config files in /etc/nagios"
+	einfo "Also, if you want nagios to start at boot time"
+	einfo "remember to execute rc-update add nagios default"
+	einfo
+	einfo "To have nagios visable on the web, please do the following:"
+	if [ "`use apache2`" ] ; then
+		einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/net-analyzer/${PF}/${PF}.ebuild config\""
+		einfo " 2. Edit /etc/conf.d/apache and add \"-D NAGIOS\""
+	fi
+	einfo
+	einfo "That will make nagios's web front end visable via"
+	einfo "http://localhost/nagios/"
+	einfo
+	if [ "`use apache2`" ] ; then
+		einfo "The Apache2 config file for nagios will be in"
+		einfo "/etc/apache2/conf/modules.d with the name of"
+		einfo "99_nagios.conf."
+	else	
+		einfo "The Apache config file for nagios will be in"
+		einfo "/etc/apache/conf/addon-modules/ with the name of"
+		einfo "nagios.conf."
+	fi
+	einfo "Also, if your kernel has /proc protection, nagios"
+	einfo "will not be happy as it relies on accessing the proc"
+	einfo "filesystem. You can fix this by adding nagios into"
+	einfo "the group wheel, but this is not recomended."
+	einfo
+}
+
+pkg_config() {
+	if [ "`use apache2`" ] ; then
+		einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+	else
+		echo "Include  conf/addon-modules/nagios.conf" \
+			>> ${ROOT}/etc/apache/conf/apache.conf
+		einfo
+		einfo "Remember to edit /etc/conf.d/apache and add \"-D NAGIOS\""
+		einfo
+	fi
+}
+pkg_prerm() {
+	/etc/init.d/nagios stop
+}