# HG changeset patch # User Eric Joseph-Alexandre # Date 1297980578 -3600 # Node ID f84080e3ed2fd4b781b3cb19c0165a6f2ce12df1 # Parent 7e463c50f245c0b34b3f9a2c58b66f366546dbb2 nagios: improve receipt diff -r 7e463c50f245 -r f84080e3ed2f nagios/receipt --- a/nagios/receipt Thu Feb 17 23:08:43 2011 +0100 +++ b/nagios/receipt Thu Feb 17 23:09:38 2011 +0100 @@ -5,8 +5,8 @@ CATEGORY="network" SHORT_DESC="Host and network monitoring" MAINTAINER="erjo@slitaz.org" -DEPENDS="apache nagios-plugins libpng libjpeg" -BUILD_DEPENDS="libgd-dev libpng-dev jpeg-dev" +DEPENDS="apache nagios-plugins libpng libjpeg libltld" +BUILD_DEPENDS="libgd-dev libpng-dev jpeg-dev libtool-dev" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.nagios.org/" WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" @@ -38,7 +38,7 @@ --libexecdir=/usr/lib/nagios/plugins \ --sbindir=/usr/lib/nagios/cgi \ --datadir=/usr/share/nagios \ - --localstatedir=/var/log/nagios \ + --localstatedir=/var/lib/nagios \ $CONFIGURE_ARGS make all && make DESTDIR=$PWD/_pkg fullinstall \ @@ -49,7 +49,7 @@ genpkg_rules() { mkdir -p $fs/usr $fs/etc/init.d \ - $fs/var/log/nagios/rw \ + $fs/var/lib/nagios/rw \ $fs/var/run/nagios \ $fs/var/spool/nagios/checkresults \ $fs/etc/apache @@ -68,6 +68,9 @@ # Fix Apache config for Nagvis sed -i 's/Options None/Options FollowSymLinks/' $fs/etc/apache/conf.d/nagios.conf + + # Fix permissions + chmod 755 $fs/usr/bin/nagios* } post_install() @@ -83,11 +86,12 @@ chroot $1/ chown -R nagios.nagios /var/log/nagios \ /var/run/nagios \ /var/spool/nagios \ + /var/lib/nagios \ /usr/share/nagios \ /etc/nagios/* - chmod 2775 $1/var/log/nagios/rw + chmod 2775 $1/var/lib/nagios/rw chroot $1/ addgroup www nagios # Start Nagios daemon if we are on running system