Masato Taruishi
taru****@users*****
2004年 11月 1日 (月) 12:28:49 JST
===================================================================
RCS file: projects/apache/10apache,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- projects/apache/10apache 2004/10/31 14:15:14 1.1
+++ projects/apache/10apache 2004/11/01 03:28:49 1.2
@@ -32,15 +32,15 @@
VHOSTCONFDIR=$(ultrapossum_getconf VHOSTCONFDIR "$SYSCONFDIR/org")
VHOSTHASH=$(ultrapossum_getconf VHOSTHASH "%0")
+ 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")
HTTP_PROVIDER=$(ultrapossum_getconf HTTP_PROVIDER "")
fi
# Parsing configuration file
-eval "`ultrapossum_parse_config example`"
+eval "`ultrapossum_parse_config apache`"
# Calculating Logical Variables
if test "x$ULTRAPOSSUM_MODULE_EXAMPLE" = "xinstalled"; then
===================================================================
RCS file: projects/apache/apache.cf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- projects/apache/apache.cf 2004/10/31 14:15:14 1.1
+++ projects/apache/apache.cf 2004/11/01 03:28:49 1.2
@@ -1,2 +1,9 @@
-## UltraPossum Example configuration
+## UltraPossum Apache configuration
+
+###
+### Virtual Host Configuration
+###
+
+# The list of virtual servers separated by spaces
+#APACHE_VHOSTS=""
===================================================================
RCS file: projects/apache/update-apache,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- projects/apache/update-apache 2004/11/01 02:54:18 1.2
+++ projects/apache/update-apache 2004/11/01 03:28:49 1.3
@@ -31,7 +31,8 @@
}
remove_debian() {
- apache-modconf apache disable mod_vhost_alias
+ :
+ # apache-modconf apache disable mod_vhost_alias
}
@@ -40,12 +41,20 @@
}
configure() {
+ install -d $VHOSTSDIR
add_startmark "##" "$id" > $tmp
if test -e "$APACHE_VHOSTIN"; then
$SHAREDIR/sedwrap < "$APACHE_VHOSTIN" >> $tmp
fi
add_endmark "##" "$id" >> $tmp
add_end_vaconf "$APACHE_HTTPDCONF" "$tmp" "$id"
+ install -d `dirname $APACHE_VHOSTSLOG`
+
+ for h in $APACHE_VHOSTS
+ do
+ install -d $VHOSTSDIR/$h/var/www
+ done
+
configure_debian
}
===================================================================
RCS file: projects/apache/vhost_alias.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- projects/apache/vhost_alias.in 2004/10/31 14:15:14 1.1
+++ projects/apache/vhost_alias.in 2004/11/01 03:28:49 1.2
@@ -1,7 +1,7 @@
# this log format can be split per-virtual-host based on the first field
-LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon
-CustomLog #LOGDIR#/apache/access_log vcommon
+LogFormat "%V %h %l %u %t \\"%r\\" %s %b" vcommon
+CustomLog #APACHE_VHOSTSLOG# vcommon
# include the server name in the filenames used to satisfy requests
VirtualDocumentRoot #VHOSTSDIR#/#VHOSTHASH#/#APACHE_DOCUMENTROOT#/