[Devil-linux-commit] build/scripts sagator,1.12,1.13

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

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

Modified Files:
	sagator 
Log Message:
install apache config in correct directory
---------------------------------------------------------------------- CVS:
Enter Log.  Lines beginning with `CVS:' are removed automatically CVS: CVS:
Committing in . CVS: CVS: Modified Files: CVS: sagator CVS:
----------------------------------------------------------------------


Index: sagator
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/sagator,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sagator	17 Apr 2006 01:02:52 -0000	1.12
+++ sagator	20 Aug 2006 13:27:24 -0000	1.13
@@ -9,7 +9,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       sagator
-# Required-Start: $basebuildtools $libs Python clamav
+# Required-Start: $basebuildtools $libs Python clamav dspam
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -31,6 +31,8 @@
 			#replace_str Makefile python2.2 python2.3
 			export PYTHONHOME=$WORKDIR/Python-install/usr
 			export PATH=$WORKDIR/Python-install/usr/bin:$PATH
+			#export APACHE_ROOT=/etc/apache2 
+			#[ "$CONFIG_DSPAM" = "y" ] && eval "export DSPAM=yes; export DSPAM_PREFIX=/usr"
 			./configure --prefix /usr || exit 1
 			make $PMAKE all || exit 1
 			strip_debug
@@ -47,6 +49,8 @@
 			rm -rf $TMPDIR/etc/sysconfig || exit 1
 			mkdir -p $CDDIR/usr/share/logwatch || exit 1
 			cp -dvpR $TMPDIR/etc/logwatch/scripts $CDDIR/usr/share/logwatch/ || exit 1
+			mkdir -p $TMPDIR/etc/apache2  || exit 1
+			mv $TMPDIR/etc/httpd/conf.d/* $TMPDIR/etc/apache2/  || exit 1
 			rm -rf $TMPDIR/etc/logwatch/scripts || exit 1
 			cp -dvpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
 			cp -dvp $MYDIR/scripts/sagator $ETCDIR/etc/init.d/ || exit 1