wok rev 8700

nagios: improve receipt
author Eric Joseph-Alexandre <erjo@slitaz.org>
date Thu Feb 17 23:09:38 2011 +0100 (2011-02-17)
parents 7e463c50f245
children 8790ebe535f1
files nagios/receipt
line diff
     1.1 --- a/nagios/receipt	Thu Feb 17 23:08:43 2011 +0100
     1.2 +++ b/nagios/receipt	Thu Feb 17 23:09:38 2011 +0100
     1.3 @@ -5,8 +5,8 @@
     1.4  CATEGORY="network"
     1.5  SHORT_DESC="Host and network monitoring"
     1.6  MAINTAINER="erjo@slitaz.org"
     1.7 -DEPENDS="apache nagios-plugins libpng libjpeg"
     1.8 -BUILD_DEPENDS="libgd-dev libpng-dev jpeg-dev"
     1.9 +DEPENDS="apache nagios-plugins libpng libjpeg libltld"
    1.10 +BUILD_DEPENDS="libgd-dev libpng-dev jpeg-dev libtool-dev"
    1.11  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.12  WEB_SITE="http://www.nagios.org/"
    1.13  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.14 @@ -38,7 +38,7 @@
    1.15  		--libexecdir=/usr/lib/nagios/plugins \
    1.16  		--sbindir=/usr/lib/nagios/cgi \
    1.17  		--datadir=/usr/share/nagios \
    1.18 -		--localstatedir=/var/log/nagios \
    1.19 +		--localstatedir=/var/lib/nagios \
    1.20  		$CONFIGURE_ARGS 
    1.21  		
    1.22  	make all && make DESTDIR=$PWD/_pkg fullinstall \
    1.23 @@ -49,7 +49,7 @@
    1.24  genpkg_rules()
    1.25  {
    1.26  	mkdir -p $fs/usr $fs/etc/init.d \
    1.27 -	  $fs/var/log/nagios/rw \
    1.28 +	  $fs/var/lib/nagios/rw \
    1.29  	  $fs/var/run/nagios \
    1.30  	  $fs/var/spool/nagios/checkresults \
    1.31  	  $fs/etc/apache
    1.32 @@ -68,6 +68,9 @@
    1.33  	
    1.34  	# Fix Apache config for Nagvis
    1.35  	sed -i 's/Options None/Options FollowSymLinks/' $fs/etc/apache/conf.d/nagios.conf
    1.36 +	
    1.37 +	# Fix permissions 
    1.38 +	chmod 755 $fs/usr/bin/nagios*
    1.39  }
    1.40  
    1.41  post_install()
    1.42 @@ -83,11 +86,12 @@
    1.43  	chroot $1/ chown -R nagios.nagios /var/log/nagios \
    1.44  	  /var/run/nagios \
    1.45  	  /var/spool/nagios \
    1.46 +	  /var/lib/nagios \
    1.47  	  /usr/share/nagios \
    1.48  	  /etc/nagios/*
    1.49  	  
    1.50  	
    1.51 -	chmod 2775 $1/var/log/nagios/rw
    1.52 +	chmod 2775 $1/var/lib/nagios/rw
    1.53  	chroot $1/ addgroup www nagios
    1.54  	
    1.55  	# Start Nagios daemon if we are  on running system