Merge branch 'bugfix/zulip-onlyoffice-integration' into develop

Zimbra · May 5, 2021 · 603b0a9 · 603b0a9
2 parents 9a3589d + 382d80f
commit 603b0a9
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/conf/jetty/jetty.xml.production b/conf/jetty/jetty.xml.production
@@ -304,6 +304,38 @@
 		</Arg>
 	</Call>
 
+    <Call id="docServerHttpsConnector" name="addConnector">
+        <Arg>
+            <New id="docServer" class="org.eclipse.jetty.server.ServerConnector">
+                <Arg name="server">
+                    <Ref refid="Server" />
+                </Arg>
+                <Arg name="factories">
+                    <Array type="org.eclipse.jetty.server.ConnectionFactory">
+                        <Item>
+                            <New class="org.eclipse.jetty.server.SslConnectionFactory">
+                                <Arg name="next">http/1.1</Arg>
+                                <Arg name="sslContextFactory">
+                                    <Ref refid="zimbraSslContextFactory" />
+                                </Arg>
+                            </New>
+                        </Item>
+                        <Item>
+                            <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                                <Arg name="config">
+                                    <Ref refid="sslHttpConfig" />
+                                </Arg>
+                            </New>
+                        </Item>
+                    </Array>
+                </Arg>
+                <Set name="host"></Set>
+                <Set name="port">%%zimbraDocumentEditingCallbackPort%%</Set>
+                <Set name="idleTimeout">60000</Set>
+            </New>
+        </Arg>
+    </Call>
+
     <!-- ADMINLOCALBEGIN %%comment VAR:zimbraAdminLocalBind,-->%%
 	<Call id="adminLocalConnector" name="addConnector">
 		<Arg>