summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/http/vhost-conf
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules/http/vhost-conf')
-rwxr-xr-xsca-cpp/trunk/modules/http/vhost-conf14
1 files changed, 5 insertions, 9 deletions
diff --git a/sca-cpp/trunk/modules/http/vhost-conf b/sca-cpp/trunk/modules/http/vhost-conf
index f45d448906..a36b195844 100755
--- a/sca-cpp/trunk/modules/http/vhost-conf
+++ b/sca-cpp/trunk/modules/http/vhost-conf
@@ -22,6 +22,9 @@ here=`readlink -f $0`; here=`dirname $here`
mkdir -p $1
root=`readlink -f $1`
+vroot=`readlink -f $2`
+vhtdocs=$3
+
conf=`cat $root/conf/httpd.conf | grep "# Generated by: httpd-conf"`
host=`echo $conf | awk '{ print $6 }'`
addr=`echo $conf | awk '{ print $7 }'`
@@ -41,24 +44,17 @@ NameVirtualHost $vhost
<VirtualHost $vhost>
ServerName http://vhost.$host:$pport
ServerAlias *.$host
-VirtualDocumentRoot $htdocs/domains/%1/
+VirtualDocumentRoot $vroot/%1/$vhtdocs/
Include conf/dvhost.conf
# Allow access to document root
-<Directory "$htdocs">
+<Directory "$vroot">
Options FollowSymLinks
AuthType None
Require all granted
</Directory>
-# Allow access to root location
-<Location />
-Options FollowSymLinks
-AuthType None
-Require all granted
-</Location>
-
</VirtualHost>
EOF