From ce92fe2df656499c94c01bd6ea15d0b12599c909 Mon Sep 17 00:00:00 2001
From: Monika Bujak <monika.bujak@hyland.com>
Date: Fri, 18 Oct 2024 15:06:32 +0200
Subject: [PATCH 1/6] [MNT-24158] Update Tomcat 10 Configuration for ACS 23.x

---
 content-services/latest/install/zip/tomcat.md | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/content-services/latest/install/zip/tomcat.md b/content-services/latest/install/zip/tomcat.md
index f9b0f9a3e7..aca2c3def6 100644
--- a/content-services/latest/install/zip/tomcat.md
+++ b/content-services/latest/install/zip/tomcat.md
@@ -81,18 +81,31 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
     2. Add the following connector:
 
         ```xml
-        <Connector port="8443" protocol="HTTP/1.1"
-            SSLEnabled="true" maxThreads="150" scheme="https"
-            keystoreFile="xxxxx"
-            keystorePass="password" keystoreType="JCEKS"
-            secure="true" connectionTimeout="240000"
-            truststoreFile="xxxxx"
-            truststorePass="password" truststoreType="JCEKS"
-            clientAuth="want" sslProtocol="TLS" />
+        <Connector port="8443"
+           protocol="org.apache.coyote.http11.Http11NioProtocol"
+           connectionTimeout="20000"
+           maxThreads="150"
+           SSLEnabled="true"
+           scheme="https"
+           secure="true"
+           defaultSSLHostConfigName="localhost">
+	<SSLHostConfig hostName="localhost"
+	               protocols="TLSv1.2"
+	               certificateVerification="required"
+	               truststoreFile="/usr/local/tomcat/alf_data/keystore/ssl.truststore"
+	               truststorePassword="truststore"
+	               truststoreType="JCEKS">
+		<Certificate certificateKeystoreFile="/usr/local/tomcat/alf_data/keystore/ssl.keystore"
+		             certificateKeyAlias="ssl.repo"
+		             type="RSA"
+		             certificateKeystorePassword="keystore"
+		             certificateKeystoreType="JCEKS"/>
+	</SSLHostConfig>
+    </Connector>
         ```
         When configuring the Tomcat connector, consider the following:
 
-        * The keystore and truststore file locations in the above example will be created later, when you install and configure Alfresco Search Services.
+        * The keystore and truststore file have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alfa_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).
 
         * If you're using a different keystore or truststore type other than the default, `JCEKS`, you must change the value in the properties file.
 

From 76649d9e8654510f43cb9b89bf58120995202983 Mon Sep 17 00:00:00 2001
From: Monika Bujak <monika.bujak@hyland.com>
Date: Fri, 18 Oct 2024 15:35:15 +0200
Subject: [PATCH 2/6] [MNT-24158] Minor fix

---
 content-services/latest/install/zip/tomcat.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content-services/latest/install/zip/tomcat.md b/content-services/latest/install/zip/tomcat.md
index aca2c3def6..5e36112384 100644
--- a/content-services/latest/install/zip/tomcat.md
+++ b/content-services/latest/install/zip/tomcat.md
@@ -103,6 +103,7 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
 	</SSLHostConfig>
     </Connector>
         ```
+        
         When configuring the Tomcat connector, consider the following:
 
         * The keystore and truststore file have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alfa_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).

From de2eda1a67dfcb34583724a408b1b1b393c4adca Mon Sep 17 00:00:00 2001
From: Monika Bujak <monika.bujak@hyland.com>
Date: Fri, 18 Oct 2024 15:54:49 +0200
Subject: [PATCH 3/6] [MNT-24158] Minor fix

---
 content-services/latest/install/zip/tomcat.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/content-services/latest/install/zip/tomcat.md b/content-services/latest/install/zip/tomcat.md
index 5e36112384..5a21835ba8 100644
--- a/content-services/latest/install/zip/tomcat.md
+++ b/content-services/latest/install/zip/tomcat.md
@@ -89,10 +89,10 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
            scheme="https"
            secure="true"
            defaultSSLHostConfigName="localhost">
-	<SSLHostConfig hostName="localhost"
+	    <SSLHostConfig hostName="localhost"
 	               protocols="TLSv1.2"
 	               certificateVerification="required"
-	               truststoreFile="/usr/local/tomcat/alf_data/keystore/ssl.truststore"
+	               truststoreFile="/usr/local/tomcat/alf_data/keystore/ssl.truststore"git add conte 
 	               truststorePassword="truststore"
 	               truststoreType="JCEKS">
 		<Certificate certificateKeystoreFile="/usr/local/tomcat/alf_data/keystore/ssl.keystore"
@@ -100,10 +100,10 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
 		             type="RSA"
 		             certificateKeystorePassword="keystore"
 		             certificateKeystoreType="JCEKS"/>
-	</SSLHostConfig>
-    </Connector>
+	    </SSLHostConfig>
+        </Connector>
         ```
-        
+
         When configuring the Tomcat connector, consider the following:
 
         * The keystore and truststore file have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alfa_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).

From ca4003b7d93c855f14190848ba9a82b57840c0eb Mon Sep 17 00:00:00 2001
From: Monika Bujak <152476722+mbujak-hyland@users.noreply.github.com>
Date: Thu, 31 Oct 2024 07:25:22 +0100
Subject: [PATCH 4/6] Minor fix

Co-authored-by: Adelaide Nxumalo <27953420+anxumalo@users.noreply.github.com>
---
 content-services/latest/install/zip/tomcat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content-services/latest/install/zip/tomcat.md b/content-services/latest/install/zip/tomcat.md
index 5a21835ba8..f9489f8c08 100644
--- a/content-services/latest/install/zip/tomcat.md
+++ b/content-services/latest/install/zip/tomcat.md
@@ -106,7 +106,7 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
 
         When configuring the Tomcat connector, consider the following:
 
-        * The keystore and truststore file have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alfa_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).
+        * The keystore and truststore file have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alf_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).
 
         * If you're using a different keystore or truststore type other than the default, `JCEKS`, you must change the value in the properties file.
 

From e964c9374771c6b377fbfe2b4a0b82645aa18172 Mon Sep 17 00:00:00 2001
From: Monika Bujak <152476722+mbujak-hyland@users.noreply.github.com>
Date: Thu, 31 Oct 2024 07:25:34 +0100
Subject: [PATCH 5/6] Minor fix

Co-authored-by: Adelaide Nxumalo <27953420+anxumalo@users.noreply.github.com>
---
 content-services/latest/install/zip/tomcat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content-services/latest/install/zip/tomcat.md b/content-services/latest/install/zip/tomcat.md
index f9489f8c08..448feda116 100644
--- a/content-services/latest/install/zip/tomcat.md
+++ b/content-services/latest/install/zip/tomcat.md
@@ -92,7 +92,7 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
 	    <SSLHostConfig hostName="localhost"
 	               protocols="TLSv1.2"
 	               certificateVerification="required"
-	               truststoreFile="/usr/local/tomcat/alf_data/keystore/ssl.truststore"git add conte 
+	               truststoreFile="/usr/local/tomcat/alf_data/keystore/ssl.truststore"
 	               truststorePassword="truststore"
 	               truststoreType="JCEKS">
 		<Certificate certificateKeystoreFile="/usr/local/tomcat/alf_data/keystore/ssl.keystore"

From e9e6ff25b8a2aa17e8f5664ba2faf60c4cad4d57 Mon Sep 17 00:00:00 2001
From: Monika Bujak <152476722+mbujak-hyland@users.noreply.github.com>
Date: Tue, 5 Nov 2024 12:29:12 +0100
Subject: [PATCH 6/6] Minor fix

---
 content-services/latest/install/zip/tomcat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content-services/latest/install/zip/tomcat.md b/content-services/latest/install/zip/tomcat.md
index 448feda116..956a01001a 100644
--- a/content-services/latest/install/zip/tomcat.md
+++ b/content-services/latest/install/zip/tomcat.md
@@ -106,7 +106,7 @@ The installation directory for Tomcat is represented as `<TOMCAT_HOME>`.
 
         When configuring the Tomcat connector, consider the following:
 
-        * The keystore and truststore file have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alf_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).
+        * The keystore and truststore files have to be generated to ensure the best security level when installing Alfresco Search Services. You can choose the location of your choice. By default, they are stored either in the Tomcat installation directory or in the `alf_data` directory. For more information, see [Alfresco Search Services secure keys generation]({%link search-services/latest/config/keys.md %}#set-up-certificates).
 
         * If you're using a different keystore or truststore type other than the default, `JCEKS`, you must change the value in the properties file.