You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/07/04 20:53:30 UTC
svn commit: r960383 - in /tuscany/sca-cpp/trunk: modules/http/httpd-conf
modules/http/httpd-ssl-conf modules/openid/openid-conf
modules/server/server-conf samples/store-python/uec2-start
Author: jsdelfino
Date: Sun Jul 4 18:53:29 2010
New Revision: 960383
URL: http://svn.apache.org/viewvc?rev=960383&view=rev
Log:
HTTPD configuration changes to properly work behind a proxy or in a cluster.
Added:
tuscany/sca-cpp/trunk/samples/store-python/uec2-start
- copied, changed from r960382, tuscany/sca-cpp/trunk/modules/server/server-conf
Modified:
tuscany/sca-cpp/trunk/modules/http/httpd-conf
tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
tuscany/sca-cpp/trunk/modules/openid/openid-conf
tuscany/sca-cpp/trunk/modules/server/server-conf
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-conf?rev=960383&r1=960382&r2=960383&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-conf Sun Jul 4 18:53:29 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf?rev=960383&r1=960382&r2=960383&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-ssl-conf Sun Jul 4 18:53:29 2010
@@ -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
Modified: tuscany/sca-cpp/trunk/modules/openid/openid-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/openid/openid-conf?rev=960383&r1=960382&r2=960383&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/openid/openid-conf (original)
+++ tuscany/sca-cpp/trunk/modules/openid/openid-conf Sun Jul 4 18:53:29 2010
@@ -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>
Modified: tuscany/sca-cpp/trunk/modules/server/server-conf
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-conf?rev=960383&r1=960382&r2=960383&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-conf Sun Jul 4 18:53:29 2010
@@ -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 }'`
Copied: tuscany/sca-cpp/trunk/samples/store-python/uec2-start (from r960382, tuscany/sca-cpp/trunk/modules/server/server-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/uec2-start?p2=tuscany/sca-cpp/trunk/samples/store-python/uec2-start&p1=tuscany/sca-cpp/trunk/modules/server/server-conf&r1=960382&r2=960383&rev=960383&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/uec2-start Sun Jul 4 18:53:29 2010
@@ -17,35 +17,30 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a server conf
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
-
-host=`cat $root/conf/httpd.conf | grep ServerName | awk '{ print $2 }'`
-port=`cat $root/conf/httpd.conf | grep Listen | tail -1 | awk '{ print $2 }'`
-
-ssl=`cat $root/conf/httpd.conf | grep "SSLEngine" | awk '{ print $2 }'`
-if [ "$ssl" = "on" ]; then
- protocol="https"
-
-cat >>$root/conf/httpd.conf <<EOF
-# Configure SCA SSL support
-SCASSLCACertificateFile "$root/conf/ca.crt"
-SCASSLCertificateFile "$root/conf/server.crt"
-SCASSLCertificateKeyFile "$root/conf/server.key"
-
-EOF
-
+# Pass your EC2 public host name
+if [ "$1" != "" ]; then
+ host=$1
else
- protocol="http"
+ host="localhost"
fi
-cat >>$root/conf/httpd.conf <<EOF
-# Support for SCA component wiring
-LoadModule mod_tuscany_wiring $here/libmod_tuscany_wiring.so
-SCAWiringServerName $protocol://$host:$port
-
-Alias /js/tuscany-ref.js $here/htdocs/js/tuscany-ref.js
+# 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
+