You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/18 06:49:57 UTC

openmeetings git commit: [OPENMEETINGS-1760] all join methods are disabled, documentation is updated

Repository: openmeetings
Updated Branches:
  refs/heads/4.0.x 02d202554 -> 6887484cb


[OPENMEETINGS-1760] all join methods are disabled, documentation is updated


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6887484c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6887484c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6887484c

Branch: refs/heads/4.0.x
Commit: 6887484cb4df4ed395a03593274c0b8b47929a1b
Parents: 02d2025
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Nov 18 13:49:44 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Nov 18 13:49:44 2017 +0700

----------------------------------------------------------------------
 openmeetings-server/src/site/xdoc/Clustering.xml        | 12 ++++++++++++
 .../src/main/webapp/WEB-INF/classes/hazelcast.xml       |  7 +++++++
 2 files changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6887484c/openmeetings-server/src/site/xdoc/Clustering.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml b/openmeetings-server/src/site/xdoc/Clustering.xml
index 6a35d19..13eb9fc 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -117,6 +117,18 @@
 						<ul>
 							<li>Set <tt>instance-name</tt> for each server to unique value</li>
 							<li>
+								Comment out/delete following block:
+								<source><![CDATA[
+<network>
+	<join>
+		<multicast enabled="false"/>
+		<tcp-ip enabled="false"/>
+		<aws enabled="false"/>
+	</join>
+</network>
+								]]></source>
+							</li>
+							<li>
 								In case there are more than one network interface with multicast support and/or additional hazelcast configuration is required
 								Based on the following documentation: <a href="http://docs.hazelcast.org/docs/3.8.3/manual/html-single/index.html">http://docs.hazelcast.org/docs/3.8.3/manual/html-single/index.html</a>
 							</li>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6887484c/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index b4a1960..3734821 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -24,6 +24,13 @@
 		xsi:schemaLocation="http://www.hazelcast.com/schema/config https://hazelcast.com/schema/config/hazelcast-config-3.8.xsd"
 	>
 	<instance-name>server-1</instance-name><!-- MAKE SURE THIS ONE IS UNIQUE -->
+	<network>
+		<join>
+			<multicast enabled="false"/>
+			<tcp-ip enabled="false"/>
+			<aws enabled="false"/>
+		</join>
+	</network>
 	<!--network>
 		<interfaces enabled="true">
 			<interface>192.168.1.*</interface>