Changes in 0a34f11: Updated amazon ec2 (markdown)

				wiki/amazon-ec2.md
			
          @@ -123,6 +123,12 @@ or

           ssh -i .ssh/SailingUser.pem sailing@ec2-54-246-247-194.eu-west-1.compute.amazonaws.com

           </pre>

          +If you want to connect your instance to a subdomain then log onto the main webserver with the Administrator key as root, open the file `/etc/httpd/conf.d/001-events.conf` and put something like this there. As you can see you have to specify the IP address and the port the java server is running on. Make sure to always use the internal IP.

          +

          +<pre>

          +Use Spectator idm.sapsailing.com "505 IDM 2013" 172.31.22.12 8888

          +</pre>

          +

           ### Testing code on a server

           Starting a test is as easy as starting up a new instance. Just make sure that you fill the field RUN_TESTS and set it to `True`. Also set the field BUILD_FROM to a gitspec that matches the code branch that you want to test. After tests has been run and the server has been started you will get an email giving you all the details. You can then access your instance or simply shut it down.

...	...	@@ -123,6 +123,12 @@ or
123	123	ssh -i .ssh/SailingUser.pem sailing@ec2-54-246-247-194.eu-west-1.compute.amazonaws.com
124	124	</pre>
125	125
	126	+If you want to connect your instance to a subdomain then log onto the main webserver with the Administrator key as root, open the file `/etc/httpd/conf.d/001-events.conf` and put something like this there. As you can see you have to specify the IP address and the port the java server is running on. Make sure to always use the internal IP.
	127	+
	128	+<pre>
	129	+Use Spectator idm.sapsailing.com "505 IDM 2013" 172.31.22.12 8888
	130	+</pre>
	131	+
126	132	### Testing code on a server
127	133
128	134	Starting a test is as easy as starting up a new instance. Just make sure that you fill the field RUN_TESTS and set it to `True`. Also set the field BUILD_FROM to a gitspec that matches the code branch that you want to test. After tests has been run and the server has been started you will get an email giving you all the details. You can then access your instance or simply shut it down.