Masato Taruishi
taru****@users*****
2004年 11月 1日 (月) 14:51:26 JST
=================================================================== RCS file: projects/apache/10apache,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- projects/apache/10apache 2004/11/01 03:28:49 1.2 +++ projects/apache/10apache 2004/11/01 05:51:26 1.3 @@ -35,6 +35,8 @@ APACHE_VHOSTSLOG=$(ultrapossum_getconf APACHE_VHOSTSLOG "$VHOSTSDIR/log/apache/access.log") APACHE_VHOSTS=$(ultrapossum_getconf APACHE_VHOSTS "") APACHE_VHOSTIN=$(ultrapossum_getconf APACHE_VHOSTIN "$TEMPLATEDIR/vhost_alias.in") + APACHE_VDOCUMENTROOT=$(ultrapossum_getconf APACHE_VDOCUMENTROOT "$VHOSTSDIR/$VHOSTHASH/$APACHE_DOCUMENTROOT/") + APACHE_VSCRIPTALIAS=$(ultrapossum_getconf APACHE_VSCRIPTALIAS "$VHOSTSDIR/$VHOSTHASH/$APACHE_DOCUMENTROOT/cgi-bin") HTTP_PROVIDER=$(ultrapossum_getconf HTTP_PROVIDER "") fi =================================================================== RCS file: projects/apache/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- projects/apache/Makefile.am 2004/10/31 14:15:14 1.1 +++ projects/apache/Makefile.am 2004/11/01 05:51:26 1.2 @@ -8,7 +8,7 @@ modulesysconf_DATA = apache.cf update_SCRIPTS = update-apache -modulelocal_SCRIPTS = +modulelocal_SCRIPTS = vhosthash template_DATA = vhost_alias.in EXTRA_DIST = update-apache \ =================================================================== RCS file: projects/apache/update-apache,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- projects/apache/update-apache 2004/11/01 03:28:49 1.3 +++ projects/apache/update-apache 2004/11/01 05:51:26 1.4 @@ -52,7 +52,7 @@ for h in $APACHE_VHOSTS do - install -d $VHOSTSDIR/$h/var/www + install -d $VHOSTSDIR/`$MODULEDIR/apache/vhosthash $h $VHOSTHASH`/var/www done configure_debian =================================================================== RCS file: projects/apache/vhost_alias.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- projects/apache/vhost_alias.in 2004/11/01 03:28:49 1.2 +++ projects/apache/vhost_alias.in 2004/11/01 05:51:26 1.3 @@ -4,6 +4,6 @@ CustomLog #APACHE_VHOSTSLOG# vcommon # include the server name in the filenames used to satisfy requests -VirtualDocumentRoot #VHOSTSDIR#/#VHOSTHASH#/#APACHE_DOCUMENTROOT#/ -VirtualScriptAlias #VHOSTSDIR#/#VHOSTHASH#/#APACHE_DOCUMENTROOT#/cgi-bin +VirtualDocumentRoot #APACHE_VDOCUMENTROOT# +VirtualScriptAlias #APACHE_VSCRIPTALIAS#
