Changes in 77696c2: Updated amazon ec2 (markdown)

				wiki/info/landscape/amazon-ec2.md
			
          @@ -23,21 +23,21 @@ You may need to select "All generations" instead of "Current generation" to see 

             <pre>

             INSTALL_FROM_RELEASE=`name-of-release`

             USE_ENVIRONMENT=live-server

          -  MONGODB_NAME=myspecificevent

          +  MONGODB_URI="mongodb://mongo0.internal.sapsailing.com,mongo1.internal.sapsailing.com/myspecificevent?replicaSet=live&retryWrites=true"

             REPLICATION_CHANNEL=myspecificevent

             SERVER_NAME=MYSPECIFICEVENT

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

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

          +  BUILD_COMPLETE_NOTIFY=your@email.here

          +  SERVER_STARTUP_NOTIFY=your@email.here

             ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"

             </pre>

           The *MailInvitationType* property controls which version of the SAP Sail Insight app will be targeted by tracking invitations sent out by e-mail.

           Two different Branch.io URL schemes exist for the Sail Insight app: sailinsight-app.sapsailing.com and sailinsight20-app.sapsailing.com.

           They can be selected by providing *SailInsight1* or *SailInsight2*, respectively, as the values for the property. If the property is

          -set to *LEGACY*, no Branch.io link is used in the invitation at all. This mode should no longer be used as soon as the Branch.io-enabled

          -iOS app has hit the store. If not provided, it will default to *SailInsight1*.

          +set to *LEGACY*, no Branch.io link is used in the invitation at all. This mode should no longer be used because the Branch.io-enabled

          +iOS app has hit the store. If not provided, it will default to *SailInsight2*.

          -Note that when you select to install an environment using the `USE_ENVIRONMENT` variable, any other variable that you specify in the user data, such as the `MONGODB_NAME` or `REPLICATION_CHANNEL` properties in the example above, these additional user data properties will override whatever comes from the environment specified by the `USE_ENVIRONMENT` parameter.

          +Note that when you select to install an environment using the `USE_ENVIRONMENT` variable, any other variable that you specify in the user data, such as the `MONGODB_URI` or `REPLICATION_CHANNEL` properties in the example above, these additional user data properties will override whatever comes from the environment specified by the `USE_ENVIRONMENT` parameter.

           - To build from git, install and start, set the following in the instance's user data, adjusting the branch name (`BUILD_FROM`), the `myspecificevent` naming and memory settings according to your needs:

             <pre>

          @@ -51,9 +51,7 @@ Note that when you select to install an environment using the `USE_ENVIRONMENT` 

             MEMORY=2048m

             REPLICATION_HOST=rabbit.internal.sapsailing.com

             REPLICATION_CHANNEL=myspecificevent

          -  MONGODB_HOST=dbserver.internal.sapsailing.com

          -  MONGODB_PORT=10202

          -  MONGODB_NAME=myspecificevent

          +  MONGODB_URI="mongodb://mongo0.internal.sapsailing.com,mongo1.internal.sapsailing.com/myspecificevent?replicaSet=live&retryWrites=true"

             </pre>

           #### Setting up a new image (AMI) from scratch (more or less)

          @@ -73,12 +71,14 @@ INSTALL_FROM_RELEASE=(name-of-release)

           USE_ENVIRONMENT=live-master-server

           SERVER_NAME=MYSPECIFICEVENT

           REPLICATION_CHANNEL=myspecificevent

          -MONGODB_NAME=myspecificevent

          +MONGODB_URI="mongodb://mongo0.internal.sapsailing.com,mongo1.internal.sapsailing.com/myspecificevent?replicaSet=live&retryWrites=true"

           SERVER_STARTUP_NOTIFY=you@email.com

           ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"

           </pre>

          -- After your master server is ready, note the internal IP and configure your replica instances. Make sure to use the preconfigured environment from http://releases.sapsailing.com/environments/live-replica-server. Then absolutely make sure to add the line "REPLICATE_MASTER_SERVLET_HOST" to the user-data and adjust the `myspecificevent` master exchange name to the `REPLICATION_CHANNEL` setting you used for the master configuration. 

          +- After your master server is ready, note the internal IP and configure your replica instances. Set up a user account there that has the following permissions: ``SERVER:REPLICATE:{SERVERNAME}``, ``SERVER:READ_REPLICATOR:{SERVERNAME}``, and ``SERVER:START_REPLICATION:{SERVERNAME}``. You will need this user's credentials to authenticate your replicas for replication.

          +

          +- Make sure to use the preconfigured environment from http://releases.sapsailing.com/environments/live-replica-server. Then absolutely make sure to add the line "REPLICATE_MASTER_SERVLET_HOST" to the user-data and adjust the `myspecificevent` master exchange name to the `REPLICATION_CHANNEL` setting you used for the master configuration. 

           <pre>

           INSTALL_FROM_RELEASE=(name-of-release)

...	...	@@ -23,21 +23,21 @@ You may need to select "All generations" instead of "Current generation" to see
23	23	<pre>
24	24	INSTALL_FROM_RELEASE=`name-of-release`
25	25	USE_ENVIRONMENT=live-server
26		- MONGODB_NAME=myspecificevent
	26	+ MONGODB_URI="mongodb://mongo0.internal.sapsailing.com,mongo1.internal.sapsailing.com/myspecificevent?replicaSet=live&retryWrites=true"
27	27	REPLICATION_CHANNEL=myspecificevent
28	28	SERVER_NAME=MYSPECIFICEVENT
29		- BUILD_COMPLETE_NOTIFY=simon.marcel.pamies@sap.com
30		- SERVER_STARTUP_NOTIFY=simon.marcel.pamies@sap.com
	29	+ BUILD_COMPLETE_NOTIFY=your@email.here
	30	+ SERVER_STARTUP_NOTIFY=your@email.here
31	31	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"
32	32	</pre>
33	33
34	34	The MailInvitationType property controls which version of the SAP Sail Insight app will be targeted by tracking invitations sent out by e-mail.
35	35	Two different Branch.io URL schemes exist for the Sail Insight app: sailinsight-app.sapsailing.com and sailinsight20-app.sapsailing.com.
36	36	They can be selected by providing SailInsight1 or SailInsight2, respectively, as the values for the property. If the property is
37		-set to LEGACY, no Branch.io link is used in the invitation at all. This mode should no longer be used as soon as the Branch.io-enabled
38		-iOS app has hit the store. If not provided, it will default to SailInsight1.
	37	+set to LEGACY, no Branch.io link is used in the invitation at all. This mode should no longer be used because the Branch.io-enabled
	38	+iOS app has hit the store. If not provided, it will default to SailInsight2.
39	39
40		-Note that when you select to install an environment using the `USE_ENVIRONMENT` variable, any other variable that you specify in the user data, such as the `MONGODB_NAME` or `REPLICATION_CHANNEL` properties in the example above, these additional user data properties will override whatever comes from the environment specified by the `USE_ENVIRONMENT` parameter.
	40	+Note that when you select to install an environment using the `USE_ENVIRONMENT` variable, any other variable that you specify in the user data, such as the `MONGODB_URI` or `REPLICATION_CHANNEL` properties in the example above, these additional user data properties will override whatever comes from the environment specified by the `USE_ENVIRONMENT` parameter.
41	41
42	42	- To build from git, install and start, set the following in the instance's user data, adjusting the branch name (`BUILD_FROM`), the `myspecificevent` naming and memory settings according to your needs:
43	43	<pre>
...	...	@@ -51,9 +51,7 @@ Note that when you select to install an environment using the `USE_ENVIRONMENT`
51	51	MEMORY=2048m
52	52	REPLICATION_HOST=rabbit.internal.sapsailing.com
53	53	REPLICATION_CHANNEL=myspecificevent
54		- MONGODB_HOST=dbserver.internal.sapsailing.com
55		- MONGODB_PORT=10202
56		- MONGODB_NAME=myspecificevent
	54	+ MONGODB_URI="mongodb://mongo0.internal.sapsailing.com,mongo1.internal.sapsailing.com/myspecificevent?replicaSet=live&retryWrites=true"
57	55	</pre>
58	56
59	57	#### Setting up a new image (AMI) from scratch (more or less)
...	...	@@ -73,12 +71,14 @@ INSTALL_FROM_RELEASE=(name-of-release)
73	71	USE_ENVIRONMENT=live-master-server
74	72	SERVER_NAME=MYSPECIFICEVENT
75	73	REPLICATION_CHANNEL=myspecificevent
76		-MONGODB_NAME=myspecificevent
	74	+MONGODB_URI="mongodb://mongo0.internal.sapsailing.com,mongo1.internal.sapsailing.com/myspecificevent?replicaSet=live&retryWrites=true"
77	75	SERVER_STARTUP_NOTIFY=you@email.com
78	76	ADDITIONAL_JAVA_ARGS="$ADDITIONAL_JAVA_ARGS -Dcom.sap.sailing.domain.tracking.MailInvitationType=SailInsight2"
79	77	</pre>
80	78
81		-- After your master server is ready, note the internal IP and configure your replica instances. Make sure to use the preconfigured environment from http://releases.sapsailing.com/environments/live-replica-server. Then absolutely make sure to add the line "REPLICATE_MASTER_SERVLET_HOST" to the user-data and adjust the `myspecificevent` master exchange name to the `REPLICATION_CHANNEL` setting you used for the master configuration.
	79	+- After your master server is ready, note the internal IP and configure your replica instances. Set up a user account there that has the following permissions: ``SERVER:REPLICATE:{SERVERNAME}``, ``SERVER:READ_REPLICATOR:{SERVERNAME}``, and ``SERVER:START_REPLICATION:{SERVERNAME}``. You will need this user's credentials to authenticate your replicas for replication.
	80	+
	81	+- Make sure to use the preconfigured environment from http://releases.sapsailing.com/environments/live-replica-server. Then absolutely make sure to add the line "REPLICATE_MASTER_SERVLET_HOST" to the user-data and adjust the `myspecificevent` master exchange name to the `REPLICATION_CHANNEL` setting you used for the master configuration.
82	82
83	83	<pre>
84	84	INSTALL_FROM_RELEASE=(name-of-release)