HTTPD configuration changes to properly work behind a proxy or in a cluster.

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

5 files changed, 78 insertions, 7 deletions

diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index 35c6c78254..b281874d92 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -21,7 +21,11 @@
 here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 host=$2
-port=$3
+port=`echo $3 | awk -F "/" '{ print $1 }'`
+pport=`echo $3 | awk -F "/" '{ print $2 }'`
+if [ "$pport" = "" ]; then
+    pport=$port
+fi
 htdocs=`readlink -f $4`
 user=`id -un`
 group=`id -gn`
@@ -34,7 +38,9 @@ cat >$root/conf/httpd.conf <<EOF
 # Apache HTTPD server configuration
 
 # Set server name
-ServerName $host
+ServerName $host:$pport
+UseCanonicalName On
+UseCanonicalPhysicalPort off
 PidFile $root/logs/httpd.pid
 
 # Minimal set of modules
@@ -114,7 +120,7 @@ Allow from all
 # Setup HTTP virtual host
 Listen $port
 <VirtualHost _default_:$port>
-
+ServerName $host:$pport
 </VirtualHost>
 
 EOF
diff --git a/sca-cpp/trunk/modules/http/httpd-ssl-conf b/sca-cpp/trunk/modules/http/httpd-ssl-conf
index 6f763c6a66..16b2322809 100755
--- a/sca-cpp/trunk/modules/http/httpd-ssl-conf
+++ b/sca-cpp/trunk/modules/http/httpd-ssl-conf
@@ -21,7 +21,11 @@
 here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 host=$2
-sslport=$3
+sslport=`echo $3 | awk -F "/" '{ print $1 }'`
+sslpport=`echo $3 | awk -F "/" '{ print $2 }'`
+if [ "$sslpport" = "" ]; then
+    sslpport=$sslport
+fi
 htdocs=`readlink -f $4`
 httpd_prefix=`cat $here/httpd.prefix`
 
@@ -33,8 +37,8 @@ cat >>$root/conf/httpd.conf <<EOF
 # Redirect all HTTP traffic to HTTPS
 <Location />
 RewriteEngine on
-RewriteCond %{SERVER_PORT} !^$sslport$  
-RewriteRule .* https://%{SERVER_NAME}:$sslport%{REQUEST_URI} [R,L]
+RewriteCond %{SERVER_PORT} !^$sslpport$  
+RewriteRule .* https://%{SERVER_NAME}:$sslpport%{REQUEST_URI} [R,L]
 </Location>
 
 # Setup SSL support
@@ -50,6 +54,9 @@ SSLRandomSeed connect builtin
 # HTTPS virtual host
 Listen $sslport
 <VirtualHost _default_:$sslport>
+ServerName $host:$sslpport
+UseCanonicalName On
+UseCanonicalPhysicalPort off
 
 # Enable SSL
 SSLEngine on
diff --git a/sca-cpp/trunk/modules/openid/openid-conf b/sca-cpp/trunk/modules/openid/openid-conf
index 5085d741cc..2d30502ea6 100755
--- a/sca-cpp/trunk/modules/openid/openid-conf
+++ b/sca-cpp/trunk/modules/openid/openid-conf
@@ -23,6 +23,14 @@ root=`readlink -f $1`
 htdocs=`readlink -f $2`
 openid_prefix=`cat openid.prefix`
 
+servername=`cat $root/conf/httpd.conf | grep ServerName | tail -1 | awk '{ print $2 }'`
+ssl=`cat $root/conf/httpd.conf | grep "SSLEngine" | awk '{ print $2 }'`
+if [ "$ssl" = "on" ]; then
+    protocol="https"
+else
+    protocol="http"
+fi
+
 # Configure HTTPD mod_auth_openid module
 cat >>$root/conf/httpd.conf <<EOF
 # Support for OpenID authentication
@@ -33,6 +41,7 @@ AuthOpenIDEnabled On
 AuthOpenIDCookiePath /
 AuthOpenIDLoginPage /protected/login
 AuthOpenIDAXAdd EMAIL http://axschema.org/contact/email
+AuthOpenIDServerName $servername
 </Location>
 
 <Location /components>
@@ -40,6 +49,7 @@ AuthOpenIDEnabled On
 AuthOpenIDCookiePath /
 AuthOpenIDLoginPage /protected/login
 AuthOpenIDAXAdd EMAIL http://axschema.org/contact/email
+AuthOpenIDServerName $servername
 </Location>
 
 <Location /references>
@@ -47,6 +57,7 @@ AuthOpenIDEnabled On
 AuthOpenIDCookiePath /
 AuthOpenIDLoginPage /protected/login
 AuthOpenIDAXAdd EMAIL http://axschema.org/contact/email
+AuthOpenIDServerName $servername
 </Location>
 
 <Location /protected/login>
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf
index c430d53de2..7cc8914f85 100755
--- a/sca-cpp/trunk/modules/server/server-conf
+++ b/sca-cpp/trunk/modules/server/server-conf
@@ -21,7 +21,8 @@
 here=`readlink -f $0`; here=`dirname $here`
 root=`readlink -f $1`
 
-host=`cat $root/conf/httpd.conf | grep ServerName | awk '{ print $2 }'`
+servername=`cat $root/conf/httpd.conf | grep ServerName | tail -1 | awk '{ print $2 }'`
+host=`echo $servername | awk -F ":" '{ print $1 }'`
 port=`cat $root/conf/httpd.conf | grep Listen | tail -1 | awk '{ print $2 }'`
 
 ssl=`cat $root/conf/httpd.conf | grep "SSLEngine" | awk '{ print $2 }'`
diff --git a/sca-cpp/trunk/samples/store-python/uec2-start b/sca-cpp/trunk/samples/store-python/uec2-start
new file mode 100755
index 0000000000..2e59815637
--- /dev/null
+++ b/sca-cpp/trunk/samples/store-python/uec2-start
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# Pass your EC2 public host name
+if [ "$1" != "" ]; then
+    host=$1
+else
+    host="localhost"
+fi
+
+# Ports 80, 443, 8090, 8453 need to be open
+sudo ../../ubuntu/ip-redirect 80 8090
+sudo ../../ubuntu/ip-redirect 443 8453
+
+../../modules/http/httpd-ca-conf tmp $host
+../../modules/http/httpd-cert-conf tmp $host
+../../modules/http/httpd-conf tmp $host 8090/80 htdocs
+../../modules/http/httpd-ssl-conf tmp $host 8453/443 htdocs
+../../modules/server/server-conf tmp
+../../modules/python/python-conf tmp
+cat >>tmp/conf/httpd.conf <<EOF
+# Configure SCA Composite
+SCAContribution `pwd`/
+SCAComposite store.composite
+
+EOF
+
+../../components/cache/memcached-start
+../../modules/http/httpd-start tmp
+