Changes in e0b2740: Updated amazon ec2 (markdown)

				wiki/amazon-ec2.md
			
          @@ -82,9 +82,18 @@ The architecture is divided into logical tiers. These are represented by firewal

           ### Create a new Analytics application instance ready for production

          -Create a new Analytics instance as described in detail here [[wiki/amazon-ec2-create-new-app-instance]]. You should use a configuration like the following. If you want to bring the code to a defined level then make sure to specify the BUILD_FROM and BUILD_COMPLETE_NOTIFY variables. If you leave them empty the instance will start using a very old build.

          +Create a new Analytics instance as described in detail here [[wiki/amazon-ec2-create-new-app-instance]]. You should use a configuration like the following. You have two possibilities of making sure that the server uses code from a specific branch.

          -Attention: You can not start the building process on t1.micro instances having less than 1.5 GB of RAM!

          +- First you can use a release file. These files can be usually found at http://releases.sapsailing.com/ and represent a certain point in time. These files can be built by using the buildAndUpdateProduct.sh with the parameter release. In addition to the release file you can specify an environment configuration. These usually can be found here http://releases.sapsailing.com/environments. A configuration then could look like this:

          +

          +<pre>

          +INSTALL_FROM_RELEASE=master-201311062138

          +USE_ENVIRONMENT=live-server

          +BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com

          +SERVER_STARTUP_NOTIFY=simon.marcel.pamies@sap.com

          +</pre>

          +

          +- The second option is to let the instance build itself from a specified branch. It is currently not supported to then specify an environment file. Attention: You can not start the building process on t1.micro instances having less than 1.5 GB of RAM! The configuration then looks like this:

           <pre>

           BUILD_BEFORE_START=True

          @@ -92,8 +101,9 @@ BUILD_FROM=master

           RUN_TESTS=False

           COMPILE_GWT=True

           BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com

          +SERVER_STARTUP_NOTIFY=

           SERVER_NAME=LIVE1

          -MEMORY=1024m

          +MEMORY=2048m

           REPLICATION_HOST=172.31.25.253

           REPLICATION_CHANNEL=sapsailinganalytics-live

           TELNET_PORT=14888

          @@ -106,7 +116,8 @@ REPLICATE_MASTER_SERVLET_HOST=

           REPLICATE_MASTER_SERVLET_PORT=

           REPLICATE_MASTER_QUEUE_HOST=

           REPLICATE_MASTER_QUEUE_PORT=

          -SERVER_STARTUP_NOTIFY=

          +INSTALL_FROM_RELEASE=

          +USE_ENVIRONMENT=

           </pre>

           After your instance has been started (and build and tests are through) it will be publicly reachable if you chose a port between 8090 and 8099. If you filled the BUILD_COMPLETE_NOTIFY field then you will get an email once the server has been built. You can also add your email address to the field SERVER_STARTUP_NOTIFY to get an email whenever the server has been started.

...	...	@@ -82,9 +82,18 @@ The architecture is divided into logical tiers. These are represented by firewal
82	82
83	83	### Create a new Analytics application instance ready for production
84	84
85		-Create a new Analytics instance as described in detail here [[wiki/amazon-ec2-create-new-app-instance]]. You should use a configuration like the following. If you want to bring the code to a defined level then make sure to specify the BUILD_FROM and BUILD_COMPLETE_NOTIFY variables. If you leave them empty the instance will start using a very old build.
	85	+Create a new Analytics instance as described in detail here [[wiki/amazon-ec2-create-new-app-instance]]. You should use a configuration like the following. You have two possibilities of making sure that the server uses code from a specific branch.
86	86
87		-Attention: You can not start the building process on t1.micro instances having less than 1.5 GB of RAM!
	87	+- First you can use a release file. These files can be usually found at http://releases.sapsailing.com/ and represent a certain point in time. These files can be built by using the buildAndUpdateProduct.sh with the parameter release. In addition to the release file you can specify an environment configuration. These usually can be found here http://releases.sapsailing.com/environments. A configuration then could look like this:
	88	+
	89	+<pre>
	90	+INSTALL_FROM_RELEASE=master-201311062138
	91	+USE_ENVIRONMENT=live-server
	92	+BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com
	93	+SERVER_STARTUP_NOTIFY=simon.marcel.pamies@sap.com
	94	+</pre>
	95	+
	96	+- The second option is to let the instance build itself from a specified branch. It is currently not supported to then specify an environment file. Attention: You can not start the building process on t1.micro instances having less than 1.5 GB of RAM! The configuration then looks like this:
88	97
89	98	<pre>
90	99	BUILD_BEFORE_START=True
...	...	@@ -92,8 +101,9 @@ BUILD_FROM=master
92	101	RUN_TESTS=False
93	102	COMPILE_GWT=True
94	103	BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com
	104	+SERVER_STARTUP_NOTIFY=
95	105	SERVER_NAME=LIVE1
96		-MEMORY=1024m
	106	+MEMORY=2048m
97	107	REPLICATION_HOST=172.31.25.253
98	108	REPLICATION_CHANNEL=sapsailinganalytics-live
99	109	TELNET_PORT=14888
...	...	@@ -106,7 +116,8 @@ REPLICATE_MASTER_SERVLET_HOST=
106	116	REPLICATE_MASTER_SERVLET_PORT=
107	117	REPLICATE_MASTER_QUEUE_HOST=
108	118	REPLICATE_MASTER_QUEUE_PORT=
109		-SERVER_STARTUP_NOTIFY=
	119	+INSTALL_FROM_RELEASE=
	120	+USE_ENVIRONMENT=
110	121	</pre>
111	122
112	123	After your instance has been started (and build and tests are through) it will be publicly reachable if you chose a port between 8090 and 8099. If you filled the BUILD_COMPLETE_NOTIFY field then you will get an email once the server has been built. You can also add your email address to the field SERVER_STARTUP_NOTIFY to get an email whenever the server has been started.