From 72ff25da66de5f465a3494e644fb68dda3108714 Mon Sep 17 00:00:00 2001
From: Yogesh Dasi <yogesh.dasi@synacor.com>
Date: Tue, 6 Apr 2021 19:33:18 +0530
Subject: [PATCH 1/3] adding new port 7074 for onlyoffice doc server callback
 urls

---
 .project                        | 17 +++++++++++++++++
 conf/jetty/jetty.xml.production | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 .project

diff --git a/.project b/.project
new file mode 100644
index 0000000..90d9cc0
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>zm-jetty-conf</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/conf/jetty/jetty.xml.production b/conf/jetty/jetty.xml.production
index bb64466..cf8d540 100644
--- 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">7074</Set>
+                <Set name="idleTimeout">60000</Set>
+            </New>
+        </Arg>
+    </Call>
+
     <!-- ADMINLOCALBEGIN %%comment VAR:zimbraAdminLocalBind,-->%%
 	<Call id="adminLocalConnector" name="addConnector">
 		<Arg>

From 3d4810ba63bc8a49fe5dab737d97c4931df2216c Mon Sep 17 00:00:00 2001
From: Yogesh Dasi <yogesh.dasi@synacor.com>
Date: Tue, 6 Apr 2021 19:35:49 +0530
Subject: [PATCH 2/3] remove .project file

---
 .project | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .project

diff --git a/.project b/.project
deleted file mode 100644
index 90d9cc0..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>zm-jetty-conf</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

From 382d80f27fc0ddb9e6bdc7e7a1a99bb8a1c2d957 Mon Sep 17 00:00:00 2001
From: Yogesh Dasi <yogesh.dasi@synacor.com>
Date: Wed, 7 Apr 2021 17:08:13 +0530
Subject: [PATCH 3/3] moving doc server callback port to ldap attr

---
 conf/jetty/jetty.xml.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/jetty/jetty.xml.production b/conf/jetty/jetty.xml.production
index cf8d540..f5f1378 100644
--- a/conf/jetty/jetty.xml.production
+++ b/conf/jetty/jetty.xml.production
@@ -330,7 +330,7 @@
                     </Array>
                 </Arg>
                 <Set name="host"></Set>
-                <Set name="port">7074</Set>
+                <Set name="port">%%zimbraDocumentEditingCallbackPort%%</Set>
                 <Set name="idleTimeout">60000</Set>
             </New>
         </Arg>