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/28 11:50:14 UTC
svn commit: r980009 [2/2] - in /tuscany/sca-cpp/trunk: ./ components/log/
components/webservice/ modules/http/ modules/java/ modules/openid/
modules/openid/htdocs/logout/ modules/python/ modules/server/ samples/
samples/store-cluster/ samples/store-clu...
Added: tuscany/sca-cpp/trunk/samples/store-cluster/start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/start?rev=980009&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cluster/start (added)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/start Wed Jul 28 09:50:12 2010
@@ -0,0 +1,83 @@
+#!/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.
+
+# Start three identical app servers
+../../modules/http/httpd-conf tmp/server1 sca-store.com 8101/80 htdocs
+../../modules/http/vhost-conf tmp/server1
+../../modules/server/server-conf tmp/server1
+../../modules/python/python-conf tmp/server1
+cat >>tmp/server1/conf/httpd.conf <<EOF
+# Configure SCA Composite for mass dynamic virtual hosting
+SCAVirtualContribution `pwd`/domains/
+SCAVirtualComposite store.composite
+
+EOF
+../../modules/http/httpd-start tmp/server1
+
+../../modules/http/httpd-conf tmp/server2 sca-store.com 8102/80 htdocs
+../../modules/http/vhost-conf tmp/server2
+../../modules/server/server-conf tmp/server2
+../../modules/python/python-conf tmp/server2
+cat >>tmp/server2/conf/httpd.conf <<EOF
+# Configure SCA Composite for mass dynamic virtual hosting
+SCAVirtualContribution `pwd`/domains/
+SCAVirtualComposite store.composite
+
+EOF
+../../modules/http/httpd-start tmp/server2
+
+../../modules/http/httpd-conf tmp/server3 sca-store.com 8103/80 htdocs
+../../modules/http/vhost-conf tmp/server3
+../../modules/server/server-conf tmp/server3
+../../modules/python/python-conf tmp/server3
+cat >>tmp/server3/conf/httpd.conf <<EOF
+# Configure SCA Composite for mass dynamic virtual hosting
+SCAVirtualContribution `pwd`/domains/
+SCAVirtualComposite store.composite
+
+EOF
+../../modules/http/httpd-start tmp/server3
+
+# Start two identical proxy balancers
+../../modules/http/httpd-conf tmp/proxy1 sca-store.com 8091/80 tmp/proxy1/htdocs
+../../modules/http/vhost-conf tmp/proxy1
+../../modules/http/proxy-conf tmp/proxy1
+../../modules/http/proxy-member-conf tmp/proxy1 localhost 8101
+../../modules/http/proxy-member-conf tmp/proxy1 localhost 8102
+../../modules/http/proxy-member-conf tmp/proxy1 localhost 8103
+../../modules/http/httpd-start tmp/proxy1
+
+../../modules/http/httpd-conf tmp/proxy2 sca-store.com 8092/80 tmp/proxy2/htdocs
+../../modules/http/vhost-conf tmp/proxy2
+../../modules/http/proxy-conf tmp/proxy2
+../../modules/http/proxy-member-conf tmp/proxy2 localhost 8101
+../../modules/http/proxy-member-conf tmp/proxy2 localhost 8102
+../../modules/http/proxy-member-conf tmp/proxy2 localhost 8103
+../../modules/http/httpd-start tmp/proxy2
+
+# Start a shared memcached
+# Todo change to one per server
+../../components/cache/memcached-start
+
+# Redirect traffic from port 80 to 8091 and use proxy1
+#../../ubuntu/ip-redirect-all 80 8091
+
+# Redirect traffic from port 80 to 8092 and use proxy2
+#../../ubuntu/ip-redirect-all 80 8092
+
Propchange: tuscany/sca-cpp/trunk/samples/store-cluster/start
------------------------------------------------------------------------------
svn:executable = *
Copied: tuscany/sca-cpp/trunk/samples/store-cluster/stop (from r978945, tuscany/sca-cpp/trunk/modules/java/java-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cluster/stop?p2=tuscany/sca-cpp/trunk/samples/store-cluster/stop&p1=tuscany/sca-cpp/trunk/modules/java/java-conf&r1=978945&r2=980009&rev=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/java-conf (original)
+++ tuscany/sca-cpp/trunk/samples/store-cluster/stop Wed Jul 28 09:50:12 2010
@@ -17,13 +17,9 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a Java server conf
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
-
-cat >>$root/conf/httpd.conf <<EOF
-# Support for Java SCA components
-LoadModule mod_tuscany_eval $here/libmod_tuscany_java.so
-
-EOF
-
+../../modules/http/httpd-stop tmp/server1
+../../modules/http/httpd-stop tmp/server2
+../../modules/http/httpd-stop tmp/server3
+../../modules/http/httpd-stop tmp/proxy1
+../../modules/http/httpd-stop tmp/proxy2
+../../components/cache/memcached-stop
Modified: tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-cpp/ssl-start Wed Jul 28 09:50:12 2010
@@ -20,7 +20,7 @@
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453
../../modules/server/server-conf tmp
../../modules/server/cpp-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-java/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-java/ssl-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-java/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-java/ssl-start Wed Jul 28 09:50:12 2010
@@ -20,7 +20,7 @@
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453
../../modules/server/server-conf tmp
../../modules/java/java-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-nosql/ssl-start Wed Jul 28 09:50:12 2010
@@ -20,7 +20,7 @@
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-python/redirect
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/redirect?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/redirect (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/redirect Wed Jul 28 09:50:12 2010
@@ -18,7 +18,6 @@
# under the License.
# Redirect ports 80 and 443
-intf=$1
-../../ubuntu/ip-redirect 80 8090 $intf
-../../ubuntu/ip-redirect 443 8453 $intf
+../../ubuntu/ip-redirect-all 80 8090
+../../ubuntu/ip-redirect-all 443 8453
Modified: tuscany/sca-cpp/trunk/samples/store-python/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/ssl-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/ssl-start Wed Jul 28 09:50:12 2010
@@ -20,7 +20,7 @@
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-python/uec2-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-python/uec2-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-python/uec2-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-python/uec2-start Wed Jul 28 09:50:12 2010
@@ -25,13 +25,13 @@ else
fi
# Ports 80, 443, 8090, 8453 need to be open
-sudo ../../ubuntu/ip-redirect 80 8090
-sudo ../../ubuntu/ip-redirect 443 8453
+sudo ../../ubuntu/ip-redirect-all 80 8090
+sudo ../../ubuntu/ip-redirect-all 443 8453
../../modules/http/ssl-ca-conf tmp $host
../../modules/http/ssl-cert-conf tmp $host
../../modules/http/httpd-conf tmp $host 8090/80 htdocs
-../../modules/http/httpd-ssl-conf tmp $host 8453/443 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453/443
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-scheme/ssl-start Wed Jul 28 09:50:12 2010
@@ -20,7 +20,7 @@
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-sql/ssl-start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-sql/ssl-start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-sql/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-sql/ssl-start Wed Jul 28 09:50:12 2010
@@ -20,7 +20,7 @@
../../modules/http/ssl-ca-conf tmp localhost
../../modules/http/ssl-cert-conf tmp localhost
../../modules/http/httpd-conf tmp localhost 8090 htdocs
-../../modules/http/httpd-ssl-conf tmp localhost 8453 htdocs
+../../modules/http/httpd-ssl-conf tmp 8453
../../modules/server/server-conf tmp
../../modules/server/scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
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=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/ssl-start Wed Jul 28 09:50:12 2010
@@ -23,8 +23,10 @@
../../modules/http/ssl-ca-conf tmp sca-store.com
../../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 vhost
-../../modules/http/httpd-ssl-conf tmp sca-store.com 8453 htdocs vhost
+../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
+../../modules/http/vhost-conf tmp
+../../modules/http/httpd-ssl-conf tmp 8453
+../../modules/http/vhost-ssl-conf tmp
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/samples/store-vhost/start
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/store-vhost/start?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/start Wed Jul 28 09:50:12 2010
@@ -17,7 +17,8 @@
# specific language governing permissions and limitations
# under the License.
-../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs vhost
+../../modules/http/httpd-conf tmp sca-store.com 8090 htdocs
+../../modules/http/vhost-conf tmp
../../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=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start (original)
+++ tuscany/sca-cpp/trunk/samples/store-vhost/uec2-start Wed Jul 28 09:50:12 2010
@@ -26,14 +26,16 @@ else
fi
# Ports 80, 443, 8090, 8453 need to be open
-sudo ../../ubuntu/ip-redirect 80 8090
-sudo ../../ubuntu/ip-redirect 443 8453
+sudo ../../ubuntu/ip-redirect-all 80 8090
+sudo ../../ubuntu/ip-redirect-all 443 8453
../../modules/http/ssl-ca-conf tmp $host
../../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 vhost
-../../modules/http/httpd-ssl-conf tmp $host 8453/443 htdocs vhost
+../../modules/http/httpd-conf tmp $host 8090/80 htdocs
+../../modules/http/vhost-conf tmp
+../../modules/http/httpd-ssl-conf tmp 8453/443
+../../modules/http/vhost-ssl-conf tmp
../../modules/server/server-conf tmp
../../modules/python/python-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
Modified: tuscany/sca-cpp/trunk/ubuntu/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/Makefile.am?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/ubuntu/Makefile.am Wed Jul 28 09:50:12 2010
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-dist_noinst_SCRIPTS = ubuntu-bin-image ubuntu-dev-image ubuntu-gcc-4.5 ubuntu-install ubuntu-install-all uec2-bin-image uec2-conf uec2-setenv uec2-start uec2-status uec2-stop
+dist_noinst_SCRIPTS = ip-redirect ip-redirect-all ubuntu-bin-image ubuntu-bin-all-image ubuntu-dev-image ubuntu-dev-all-image ubuntu-gcc-4.5 ubuntu-install ubuntu-install-all uec2-bin-image uec2-bin-all-image uec2-dev-image uec2-dev-all-image uec2-conf uec2-setenv uec2-ssh uec2-start uec2-status uec2-stop
Modified: tuscany/sca-cpp/trunk/ubuntu/ip-redirect
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ip-redirect?rev=980009&r1=980008&r2=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/ubuntu/ip-redirect (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ip-redirect Wed Jul 28 09:50:12 2010
@@ -15,18 +15,19 @@
# specific language governing permissions and limitations
# under the License.
-# Redirect TCP/IP traffic from one port to another port, useful to handle
-# incoming traffic on standard reserved ports like 80 or 443 for example
-# in an unprivileged user server process bound to a non-reserved port
-# Example: ip-redirect 80 8090 eth0
+# Redirect TCP/IP traffic to a particular IP address from one port to another
+# port. This is useful to handle incoming traffic on a standard reserved port
+# like 80 or 443 for example in an unprivileged user process bound to a non
+# reserved port.
+# Example: ip-redirect 80 8090 10.1.1.1
-source=$1
-target=$2
-if [ "$3" != "" ]; then
- intf=$3
-else
- intf="eth0"
-fi
+sport=$1
+tport=$2
+dest=$3
-sudo /sbin/iptables -t nat -A PREROUTING -i $intf -p tcp --dport $source -j REDIRECT --to-port $target
+# Redirect external incoming traffic
+sudo /sbin/iptables -t nat -A PREROUTING --destination $dest -p tcp --dport $sport -j REDIRECT --to-port $tport
+
+# Redirect local traffic as well
+sudo /sbin/iptables -t nat -A OUTPUT --destination $dest -p tcp --dport $sport -j REDIRECT --to-port $tport
Copied: tuscany/sca-cpp/trunk/ubuntu/ip-redirect-all (from r978945, tuscany/sca-cpp/trunk/modules/java/java-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/ip-redirect-all?p2=tuscany/sca-cpp/trunk/ubuntu/ip-redirect-all&p1=tuscany/sca-cpp/trunk/modules/java/java-conf&r1=978945&r2=980009&rev=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/java-conf (original)
+++ tuscany/sca-cpp/trunk/ubuntu/ip-redirect-all Wed Jul 28 09:50:12 2010
@@ -1,5 +1,3 @@
-#!/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
@@ -17,13 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a Java server conf
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
+# Redirect TCP/IP traffic to all local addresses from one port to another
+# Example: ip-redirect 80 8090
-cat >>$root/conf/httpd.conf <<EOF
-# Support for Java SCA components
-LoadModule mod_tuscany_eval $here/libmod_tuscany_java.so
+here=`readlink -f $0`; here=`dirname $here`
+sport=$1
+tport=$2
-EOF
+/sbin/ifconfig | grep "inet addr:" | awk -F ":" '{ print $2 }' | awk '{ print $1 }' | xargs -i $here/ip-redirect $sport $tport {}
Copied: tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image (from r978945, tuscany/sca-cpp/trunk/modules/server/scheme-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image?p2=tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image&p1=tuscany/sca-cpp/trunk/modules/server/scheme-conf&r1=978945&r2=980009&rev=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/scheme-conf (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-bin-all-image Wed Jul 28 09:50:12 2010
@@ -1,5 +1,3 @@
-#!/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
@@ -17,12 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a Scheme server conf
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
+# Install a Tuscany image on an EC2 instance
+host=$1
-cat >>$root/conf/httpd.conf <<EOF
-# Support for Scheme SCA components
-LoadModule mod_tuscany_eval $here/libmod_tuscany_eval.so
+# Download and execute Tuscany SCA install script
+ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-bin-all-image; chmod 700 ./ubuntu-bin-all-image; ./ubuntu-bin-all-image"
-EOF
Copied: tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image (from r978945, tuscany/sca-cpp/trunk/modules/server/scheme-conf)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image?p2=tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image&p1=tuscany/sca-cpp/trunk/modules/server/scheme-conf&r1=978945&r2=980009&rev=980009&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/scheme-conf (original)
+++ tuscany/sca-cpp/trunk/ubuntu/uec2-dev-all-image Wed Jul 28 09:50:12 2010
@@ -1,5 +1,3 @@
-#!/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
@@ -17,12 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a Scheme server conf
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
+# Build a Tuscany image on an EC2 instance
+host=$1
-cat >>$root/conf/httpd.conf <<EOF
-# Support for Scheme SCA components
-LoadModule mod_tuscany_eval $here/libmod_tuscany_eval.so
+# Download and execute Tuscany SCA install script
+ssh -i $HOME/.ec2/ec2-tuscany-keypair.pem ubuntu@$host "wget http://svn.apache.org/repos/asf/tuscany/sca-cpp/trunk/ubuntu/ubuntu-dev-all-image; chmod 700 ./ubuntu-dev-all-image; ./ubuntu-dev-all-image"
-EOF