Refactor and cleanup some of the config scripts. Add a sample using mod_proxy_balancer to distribute requests across three servers.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@980009 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 19 deletions

diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index 70c0b295af..149bc56c4d 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -19,6 +19,7 @@
 
 # Generate a minimal HTTPD configuration
 here=`readlink -f $0`; here=`dirname $here`
+mkdir -p $1
 root=`readlink -f $1`
 host=$2
 port=`echo $3 | awk -F "/" '{ print $1 }'`
@@ -26,19 +27,20 @@ pport=`echo $3 | awk -F "/" '{ print $2 }'`
 if [ "$pport" = "" ]; then
     pport=$port
 fi
+mkdir -p $4
 htdocs=`readlink -f $4`
 user=`id -un`
 group=`id -gn`
 modules_prefix=`cat $here/httpd-modules.prefix`
-vhost=$5
 
 mkdir -p $root
 mkdir -p $root/logs
 mkdir -p $root/conf
 cat >$root/conf/httpd.conf <<EOF
+# Generated by: httpd-conf $*
 # Apache HTTPD server configuration
 
-# Set server name
+# Main server name
 ServerName http://$host:$pport
 PidFile $root/logs/httpd.pid
 
@@ -114,37 +116,40 @@ Allow from all
 # Allow access to service components
 <Location />
 Options FollowSymLinks
+Order deny,allow  
 Allow from all
 </Location>
 
-# Setup HTTP virtual hosts
+# Setup HTTP virtual host
 Listen $port
 
 <VirtualHost *:$port>
 ServerName http://$host:$pport
-UseCanonicalName Off
+
+Include conf/svhost.conf
 </VirtualHost>
 
 EOF
 
-# Generate mass dynamic virtual hosting configuration
-if [ "$vhost" = "vhost" ]; then
-
-cat >>$root/conf/httpd.conf <<EOF
-# Setup mass dynamic virtual hosting
-NameVirtualHost *:$port
-
-<VirtualHost *:$port>
-ServerName http://vhost.$host:$pport
-ServerAlias *.$host
+# Generate vhost configuration
+cat >$root/conf/vhost.conf <<EOF
+# Generated by: httpd-conf $*
+# Virtual host configuration
 UseCanonicalName Off
-VirtualDocumentRoot $htdocs/domains/%1/
-</VirtualHost>
 
-# Isolate virtual host based requests
-MaxRequestsPerChild 1
+EOF
+
+cat >$root/conf/svhost.conf <<EOF
+# Generated by: httpd-conf $*
+# Static virtual host configuration
+Include conf/vhost.conf
 
 EOF
 
-fi
+cat >$root/conf/dvhost.conf <<EOF
+# Generated by: httpd-conf $*
+# Mass dynamic virtual host configuration
+Include conf/vhost.conf
+
+EOF