Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28680/scripts
Modified Files:
httpd
Log Message:
- enable apache disk cache module (Bjoern Rudner / Heiko)
Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- httpd 25 May 2006 02:12:02 -0000 1.7
+++ httpd 27 Feb 2007 14:20:36 -0000 1.8
@@ -35,8 +35,8 @@
--enable-ssl=shared --enable-bucketeer --enable-http --enable-info --enable-cgi --enable-vhost-alias \
--enable-rewrite --enable-so --enable-dav --enable-dav-fs \
--enable-mods-shared=all --enable-suexec --with-suexec-caller=www \
- --enable-layout=Debian --enable-mem-cache --enable-cache || exit 1
- # not working --enable-ldap --enable-auth-ldap --enable-mem-cache
+ --enable-layout=Debian --enable-mem-cache --enable-disk-cache --enable-cache || exit 1
+ # not working --enable-ldap --enable-auth-ldap
make $PMAKE all || exit 1
strip_debug
# install it, we need the libraries later
@@ -46,19 +46,30 @@
install )
if [ "$CONFIG_HTTPD" = "y" ]; then
- rm -rf $WORKDIR/tmp
- make install DESTDIR=$WORKDIR/tmp
- rm -rf $WORKDIR/tmp/etc/apache2/build || exit 1
- rm -rf $WORKDIR/tmp/usr/lib/*a || exit 1
- rm -rf $WORKDIR/tmp/usr/include || exit 1
- cp -dpR $WORKDIR/tmp/etc/* $ETCDIR/etc/ || exit 1
- rm -rf $WORKDIR/tmp/etc
- copy_docs $WORKDIR/tmp/
- cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1
- rm -rf $WORKDIR/tmp || exit 1
+ rm -rf $TMPDIR
+ make install DESTDIR=$TMPDIR
+ rm -rf $TMPDIR/etc/apache2/build || exit 1
+ rm -rf $TMPDIR/usr/lib/*a || exit 1
+ rm -rf $TMPDIR/usr/include || exit 1
+ cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1
+ rm -rf $TMPDIR/etc
+ copy_docs $TMPDIR/
+ cp -dpR $TMPDIR/* $CDDIR || exit 1
+ rm -rf $TMPDIR || exit 1
cp $MYDIR/scripts/httpd $ETCDIR/etc/init.d || exit 1
+ cp -dpR $ETCDIR/etc/apache2/httpd.conf $ETCDIR/etc/apache2/httpd.conf.default
+ replace_str $ETCDIR/etc/apache2/httpd.conf '^ServerRoot ""' '#ServerRoot ""'
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^LoadModule dbd_module /usr/lib/apache2/modules/mod_dbd.so" "#LoadModule dbd_module /usr/lib/apache2/modules/mod_dbd.so"
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so" "#LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so"
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^User daemon" "User nobody"
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^Group daemon" "Group nogroup"
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^#EnableMMAP off" "EnableMMAP off"
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^#EnableSendfile off" "EnableSendfile off"
+ replace_str $ETCDIR/etc/apache2/httpd.conf "^DefaultType text/plain" "DefaultType text/plain\\n\\nAddType application/x-httpd-php .php .php4 .php3 .phtml"
+ rm -f $ETCDIR/etc/apache2/httpd.conf.old
+
echo "# Start $MYNAME?" >> $CONFIGFILE
echo "START_$MYNAME=no" >> $CONFIGFILE
echo "${MYNAME}_PARM=\"-f /etc/apache2/httpd.conf\"" >> $CONFIGFILE
|
