diff --git a/README.md b/README.md index 59e1a1e..c76eca0 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Maintenance Window: No Preference ## Launch Tsung Instance -Launch instance of `ami-e291668b` with size m1.large. When SSHing into +Launch instance of `ami-0316d86a` with size m1.large. When SSHing into the instance, make sure to use Agent Forwarding so we can SSH from the Tsung instance to other instances without a password. For this to work on my Mac, I had to @@ -43,12 +43,12 @@ Login to the instance as the 'ec2-user' user then run the setup_client.sh script curl -o setup_client.sh https://raw.github.com/torquebox/speedmetal/master/scripts/setup_client.sh chmod +x setup_client.sh - ./setup_client.sh server_instance_ip_address + ./setup_client.sh server_instance_private_ip_address ## Launch Server Instance -Launch instance of 'ami-e291668b' with size c1.xlarge in the same +Launch instance of 'ami-0316d86a' with size c1.xlarge in the same availability zone and security group as the Tsung instance. Login to the instance as the 'ec2-user' user then run the setup_server.sh script. diff --git a/apps/rails3/spree/README.md b/apps/rails3/spree/README.md index c3c2b75..2003f36 100644 --- a/apps/rails3/spree/README.md +++ b/apps/rails3/spree/README.md @@ -14,21 +14,12 @@ When prompted to load sample data during db:bootstrap, choose yes. Create a deployment descriptor - rm -f $JBOSS_HOME/standalone/deployments/*-knob* - cat << EOF > $JBOSS_HOME/standalone/deployments/spree-knob.yml - --- - application: - root: /mnt/data/speedmetal/apps/rails3/spree/ - env: production - web: - context: / - EOF - touch $JBOSS_HOME/standalone/deployments/spree-knob.yml.dodeploy + torquebox deploy --env=production Start TorqueBox screen - $JBOSS_HOME/bin/standalone.sh -Djboss.bind.address=0.0.0.0 -Dorg.torquebox.web.http.maxThreads=100 + torquebox run -b 0.0.0.0 --max-threads=100 diff --git a/scripts/setup_client.sh b/scripts/setup_client.sh index 4d6bb85..57de717 100755 --- a/scripts/setup_client.sh +++ b/scripts/setup_client.sh @@ -35,6 +35,10 @@ cd ../ # Add /etc/hosts entry for our server instance echo "$SERVER_IP server" | sudo tee -a /etc/hosts +# Open up iptables +sudo iptables -I INPUT -p tcp -j ACCEPT +sudo iptables -I INPUT -p udp -j ACCEPT + echo "" echo "Client Setup Finished Successfully" echo "" diff --git a/scripts/setup_server.sh b/scripts/setup_server.sh index 8ca5fdd..b0c88c9 100755 --- a/scripts/setup_server.sh +++ b/scripts/setup_server.sh @@ -34,15 +34,15 @@ git clone git://github.com/torquebox/speedmetal.git # Add /etc/hosts entry for our RDS instance echo "$RDS_IP database" | sudo tee -a /etc/hosts +# Open up iptables +sudo iptables -I INPUT -p tcp -j ACCEPT +sudo iptables -I INPUT -p udp -j ACCEPT + install_java7() { sudo yum install -y wget - wget http://www.java.net/download/jdk7u2/archive/b08/binaries/jdk-7u2-ea-bin-b08-linux-x64-21_sep_2011.tar.gz - tar xzf jdk-7u2-ea-bin-b08-linux-x64-21_sep_2011.tar.gz - ln -s jdk1.7.0_02 jdk - echo "export JAVA_HOME=/mnt/data/jdk" >> ~/.bash_profile - echo "export PATH=\$JAVA_HOME/bin:\$PATH" >> ~/.bash_profile - source ~/.bash_profile + wget http://download.oracle.com/otn-pub/java/jdk/7u2-b13/jdk-7u2-linux-x64.rpm + sudo yum install jdk-7u2-linux-x64.rpm } install_ruby() {