Author: jsdelfino
Date: Sat Feb 26 20:59:49 2011
New Revision: 1074925
URL: http://svn.apache.org/viewvc?rev=1074925&view=rev
Log:
Move virtual host htdocs under their corresponding virtual host contribution
directory.
Added:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html
tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/
tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html
tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/
tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html
- copied, changed from r1074924,
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html
Removed:
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/
Modified:
tuscany/sca-cpp/trunk/modules/http/vhost-conf
tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf
tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am
tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf
tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf
tuscany/sca-cpp/trunk/samples/store-cluster/server-conf
tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
tuscany/sca-cpp/trunk/samples/store-vhost/Makefile.am
tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
tuscany/sca-cpp/trunk/samples/store-vhost/start
tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start
Modified: tuscany/sca-cpp/trunk/modules/http/vhost-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/vhost-conf?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/vhost-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/vhost-conf Sat Feb 26 20:59:49 2011
@@ -22,6 +22,9 @@ here=`readlink -f $0`; here=`dirname $he
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
Modified: tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/vhost-ssl-conf Sat Feb 26 20:59:49 2011
@@ -31,6 +31,10 @@ sslport=`$here/httpd-addr port $ssladdr`
sslpport=`$here/httpd-addr pport $ssladdr`
sslvhost=`$here/httpd-addr vhost $ssladdr`
+vhostconf=`cat $root/conf/httpd.conf | grep "# Generated by: vhost-conf"`
+vroot=`echo $vhostconf | awk '{ print $6 }'`; vroot=`readlink -f $vroot`
+vhtdocs=`echo $vhostconf | awk '{ print $7 }'`
+
htdocs=`echo $conf | awk '{ print $8 }'`
mkdir -p $htdocs
htdocs=`readlink -f $htdocs`
@@ -45,9 +49,16 @@ NameVirtualHost $sslvhost
<VirtualHost $sslvhost>
ServerName https://vhost.$host:$sslpport
ServerAlias *.$host
-VirtualDocumentRoot $htdocs/domains/%1/
+VirtualDocumentRoot $vroot/%1/$vhtdocs/
Include conf/dvhost-ssl.conf
+# Allow access to document root
+<Directory "$vroot">
+Options FollowSymLinks
+AuthType None
+Require all granted
+</Directory>
+
</VirtualHost>
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/Makefile.am Sat Feb 26 20:59:49
2011
@@ -24,7 +24,7 @@ if WANT_QUEUE
dist_sample_SCRIPTS = start stop ssl-start ssl-stop proxy-conf proxy-ssl-conf
server-conf server-ssl-conf tunnel-ssl-conf sqldb-master-conf sqldb-standby-conf
sampledir = $(prefix)/samples/store-cluster
-nobase_dist_sample_DATA = htdocs/*.html htdocs/*/*.html
htdocs/domains/*/*.html htdocs/domains/*/*/*.html domains/*/*.py
domains/*/*.composite shared/*.composite
+nobase_dist_sample_DATA = htdocs/*.html htdocs/*/*.html
domains/*/htdocs/*.html domains/*/htdocs/*/*.html domains/*/*.py
domains/*/*.composite shared/*.composite
dist_noinst_SCRIPTS = server-test
#TESTS = server-test
Copied:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html
(from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html?p2=tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/index.html&p1=tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Copied:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html
(from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html?p2=tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/login/index.html&p1=tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/login/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Copied:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html
(from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html?p2=tuscany/sca-cpp/trunk/samples/store-cluster/domains/jane/htdocs/logout/index.html&p1=tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/jane/logout/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Copied:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html (from
r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html?p2=tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/index.html&p1=tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Copied:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html
(from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html?p2=tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/login/index.html&p1=tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/login/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Copied:
tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html
(from r1074924,
tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html?p2=tuscany/sca-cpp/trunk/samples/store-cluster/domains/joe/htdocs/logout/index.html&p1=tuscany/sca-cpp/trunk/samples/store-cluster/htdocs/domains/joe/logout/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/proxy-conf Sat Feb 26 20:59:49
2011
@@ -24,7 +24,7 @@ set -x
# Configure a proxy balancer
../../modules/http/httpd-conf $root sca-store.com $port/80 $root/htdocs
-../../modules/http/vhost-conf $root
+../../modules/http/vhost-conf $root $root/domains htdocs
../../modules/http/proxy-conf $root
../../modules/http/httpd-event-conf $root
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/proxy-ssl-conf Sat Feb 26
20:59:49 2011
@@ -25,7 +25,7 @@ set -x
# Configure an SSL-enabled proxy balancer
../../modules/http/httpd-conf $root sca-store.com $port $root/htdocs
-../../modules/http/vhost-conf $root
+../../modules/http/vhost-conf $root $root/domains htdocs
../../modules/http/proxy-conf $root
../../modules/http/httpd-event-conf $root
tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/server-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-conf?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/server-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-conf Sat Feb 26 20:59:49
2011
@@ -24,7 +24,7 @@ set -x
# Configure an app server
../../modules/http/httpd-conf $root sca-store.com $port/80 htdocs
-../../modules/http/vhost-conf $root
+../../modules/http/vhost-conf $root domains htdocs
../../modules/server/server-conf $root
../../modules/python/python-conf $root
cat >>$root/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/server-ssl-conf Sat Feb 26
20:59:49 2011
@@ -25,7 +25,7 @@ set -x
# Configure an SSL-enabled app server
../../modules/http/httpd-conf $root sca-store.com $port htdocs
-../../modules/http/vhost-conf $root
+../../modules/http/vhost-conf $root domains htdocs
tar -C tmp/ssl -c `../../modules/http/ssl-cert-find tmp/ssl` | tar -C $root -x
../../modules/http/httpd-ssl-conf $root $sslport
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/Makefile.am
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/Makefile.am?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/Makefile.am Sat Feb 26 20:59:49
2011
@@ -20,7 +20,7 @@ if WANT_PYTHON
dist_sample_SCRIPTS = start stop ssl-start uec2-start
sampledir = $(prefix)/samples/store-vhost
-nobase_dist_sample_DATA = htdocs/*.html htdocs/domains/*/*.html domains/*/*.py
domains/*/*.composite shared/*.composite
+nobase_dist_sample_DATA = htdocs/*.html domains/*/htdocs/*.html domains/*/*.py
domains/*/*.composite shared/*.composite
dist_noinst_SCRIPTS = server-test
#TESTS = server-test
Copied:
tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html (from
r1074924,
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html?p2=tuscany/sca-cpp/trunk/samples/store-vhost/domains/jane/htdocs/index.html&p1=tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/jane/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Copied: tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html
(from r1074924,
tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html?p2=tuscany/sca-cpp/trunk/samples/store-vhost/domains/joe/htdocs/index.html&p1=tuscany/sca-cpp/trunk/samples/store-vhost/htdocs/domains/joe/index.html&r1=1074924&r2=1074925&rev=1074925&view=diff
==============================================================================
(empty)
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Sat Feb 26 20:59:49 2011
@@ -24,7 +24,7 @@
../../modules/http/ssl-cert-conf tmp sca-store.com server
../../modules/http/ssl-cert-conf tmp *.sca-store.com vhost
../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
-../../modules/http/vhost-conf tmp
+../../modules/http/vhost-conf tmp domains htdocs
../../modules/http/httpd-ssl-conf tmp 8453
../../modules/http/vhost-ssl-conf tmp
../../modules/http/basic-auth-conf tmp
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/start?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/start Sat Feb 26 20:59:49 2011
@@ -18,7 +18,7 @@
# under the License.
../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
-../../modules/http/vhost-conf tmp
+../../modules/http/vhost-conf tmp domains htdocs
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start?rev=1074925&r1=1074924&r2=1074925&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start Sat Feb 26 20:59:49
2011
@@ -33,7 +33,7 @@ sudo ../../ubuntu/ip-redirect-all 443 84
../../modules/http/ssl-cert-conf tmp $host server
../../modules/http/ssl-cert-conf tmp "*.$host" vhost
../../modules/http/httpd-conf tmp $host 8090/80 htdocs
-../../modules/http/vhost-conf tmp
+../../modules/http/vhost-conf tmp domains htdocs
../../modules/http/httpd-ssl-conf tmp 8453/443
../../modules/http/vhost-ssl-conf tmp
../../modules/server/server-conf tmp
