[Devil-linux-commit] build/scripts ntop,1.3.2.2,1.3.2.3

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17953/scripts

Modified Files:
      Tag: rel-1-2-patches
	ntop 
Log Message:
added support for /etc/ntop.conf (Heiko / Herbert Augustiny)


Index: ntop
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/ntop,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- ntop	23 Oct 2004 00:12:24 -0000	1.3.2.2
+++ ntop	12 Apr 2005 15:03:47 -0000	1.3.2.3
@@ -40,30 +40,30 @@
 
 	install )
 		if [ "$CONFIG_NTOP" = "y" ]; then
-			rm -rf $WORKDIR/tmp || exit 1
-			mkdir -p $WORKDIR/tmp/usr || exit 1
-			make install DESTDIR=$WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
+			mkdir -p $TMPDIR/usr || exit 1
+			make install DESTDIR=$TMPDIR || exit 1
 
-			rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
+			rm -rf $TMPDIR/usr/lib/*a || exit 1
 
-			copy_docs $WORKDIR/tmp
+			copy_docs $TMPDIR
 
-			mkdir -p $WORKDIR/tmp/usr/share/ntop || exit 1
-			chmod -x $WORKDIR/tmp/etc/ntop/*.gz 
-			mv -f $WORKDIR/tmp/etc/ntop/*.gz $WORKDIR/tmp/usr/share/ntop/ || exit 1
-			ln -sf /usr/share/ntop/etter.passive.os.fp.gz $WORKDIR/tmp/etc/ntop/etter.passive.os.fp.gz || exit 1
-			ln -sf /usr/share/ntop/oui.txt.gz $WORKDIR/tmp/etc/ntop/oui.txt.gz || exit 1
-			ln -sf /usr/share/ntop/p2c.opt.table.gz $WORKDIR/tmp/etc/ntop/p2c.opt.table.gz || exit 1
-			ln -sf /usr/share/ntop/specialMAC.txt.gz $WORKDIR/tmp/etc/ntop/specialMAC.txt.gz || exit 1
+			mkdir -p $TMPDIR/usr/share/ntop || exit 1
+			chmod -x $TMPDIR/etc/ntop/*.gz 
+			mv -f $TMPDIR/etc/ntop/*.gz $TMPDIR/usr/share/ntop/ || exit 1
+			ln -sf /usr/share/ntop/etter.passive.os.fp.gz $TMPDIR/etc/ntop/etter.passive.os.fp.gz || exit 1
+			ln -sf /usr/share/ntop/oui.txt.gz $TMPDIR/etc/ntop/oui.txt.gz || exit 1
+			ln -sf /usr/share/ntop/p2c.opt.table.gz $TMPDIR/etc/ntop/p2c.opt.table.gz || exit 1
+			ln -sf /usr/share/ntop/specialMAC.txt.gz $TMPDIR/etc/ntop/specialMAC.txt.gz || exit 1
 
 			cp -dp $MYDIR/scripts/ntop $ETCDIR/etc/init.d/ || exit 1
-			cp -dpfR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
+			cp -dpfR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 
-			copy_files $WORKDIR/tmp/usr $CDDIR/ || exit 1
+			copy_files $TMPDIR/usr $CDDIR/ || exit 1
 			
 			useradd -u 105 -g nogroup -s /bin/false -c "ntop daemon" ntop
 			
-			rm -rf $WORKDIR/tmp || exit 1
+			rm -rf $TMPDIR || exit 1
 
                 	mkdir -p $CDDIR/var/lib/ntop || exit 1
         	        chmod -R 755 $CDDIR/var/lib/ntop || exit 1
@@ -74,8 +74,10 @@
 			echo "NTOP_INTERFACES=eth0,eth1" >> $CONFIGFILE
 			echo "NTOP_PORT=8080" >> $CONFIGFILE
 			echo "NTOP_SSL_PORT=0" >> $CONFIGFILE
+			echo "NTOP_DB_PATH=/etc/ntop" >> $CONFIGFILE
 			echo >> $CONFIGFILE
 			echo "HELP_$MYNAME=\"ntop is a network traffic probe that shows network usage\"" >> $SOFTWAREHELP
+			echo "# place your configuration here" > $ETCDIR/etc/ntop.conf
 		fi
 		;;