diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-27 19:54:31 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-12-27 19:54:31 +0000 |
commit | ddee608e434b5ed3751dee6cfd27394ddb654b16 (patch) | |
tree | c5f5caee354fd51176464e7844ad531a2fc21fda /sca-cpp/trunk/ubuntu/uec2-conf | |
parent | 1c0d8a7ab823150bdbece285e71cd6f414621cfc (diff) |
Improve EC2 setup scripts. Remove dependency on external environment variables.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1053166 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rwxr-xr-x | sca-cpp/trunk/ubuntu/uec2-conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sca-cpp/trunk/ubuntu/uec2-conf b/sca-cpp/trunk/ubuntu/uec2-conf index 34ec6f5d49..7bfb4dfdcb 100755 --- a/sca-cpp/trunk/ubuntu/uec2-conf +++ b/sca-cpp/trunk/ubuntu/uec2-conf @@ -17,7 +17,7 @@ # Configure EC2 for use with Tuscany SCA here=`readlink -f $0`; here=`dirname $here` -$here/uec2-setenv +. $here/uec2-setenv # Display commands as they are executed set -x @@ -27,9 +27,9 @@ set -x sudo apt-get install ec2-api-tools # Create an EC2 SSH keypair if necessary -if [ ! -f $HOME/.ec2/ec2-tuscany-keypair.pem ]; then - ec2-add-keypair ec2-tuscany-keypair --region us-west-1 > $HOME/.ec2/ec2-tuscany-keypair.pem - chmod 600 $HOME/.ec2/ec2-tuscany-keypair.pem +if [ ! -f $HOME/.ec2/ec2-keypair.pem ]; then + ec2-add-keypair ec2-keypair --region us-west-1 > $HOME/.ec2/ec2-keypair.pem + chmod 600 $HOME/.ec2/ec2-keypair.pem fi # Authorize SSH, HTTP and HTTPS access to EC2 instances |