From 86a6a2bcdeb39f50430c606b0333fdb8ff13ab98 Mon Sep 17 00:00:00 2001
From: Monika Michalska <monika.michalska@hyland.com>
Date: Thu, 14 Nov 2024 11:35:16 +0100
Subject: [PATCH 1/3] [MNT-24158] Add Tomcat 10 instructions in Search Services
 2.0

---
 search-services/latest/config/keys.md     | 28 +++++++++++++++++++++++
 search-services/latest/config/security.md | 28 +++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/search-services/latest/config/keys.md b/search-services/latest/config/keys.md
index 8c50ca5239..0881249e92 100644
--- a/search-services/latest/config/keys.md
+++ b/search-services/latest/config/keys.md
@@ -162,6 +162,8 @@ Before continuing, make sure that you've already completed the steps in [Generat
 
     2. For the Tomcat SSL Connector in `<TOMCAT_HOME>/conf/server.xml` update the following:
 
+        * If using Alfresco Content Services 6.x on Tomcat 8:
+
         ```bash
         <Connector port="8443" protocol="HTTP/1.1"
             SSLEnabled="true" maxThreads="150" scheme="https"
@@ -173,6 +175,32 @@ Before continuing, make sure that you've already completed the steps in [Generat
             clientAuth="want" sslProtocol="TLS" />
         ```
 
+        * If using Alfresco Content Services 7.x on Tomcat 9 or 23.x on Tomcat 10:
+
+        ```bash
+        <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>
+        ```
+
         > **Note:** If you're using a different keystore or truststore type other than the default, `JCEKS`, you must change the value in the properties file. Also, make sure that the keystore and truststore file locations are correct for your environment.
 
     See [Installing the Tomcat application server]({% link content-services/latest/install/zip/tomcat.md %}) and [Solr configuration files]({% link search-services/latest/config/index.md %}#solr-configuration-files) for more.
diff --git a/search-services/latest/config/security.md b/search-services/latest/config/security.md
index f74f2cfd09..24b9a9fe5e 100644
--- a/search-services/latest/config/security.md
+++ b/search-services/latest/config/security.md
@@ -17,6 +17,8 @@ The keys and certificates required for mutual TLS on the repository side are set
 
 1. Modify `<TOMCAT_HOME>/conf/server.xml` and add the following connector:
 
+    * If using Alfresco Content Accelerator 6.x on Tomcat 8:
+
     ```xml
     <Connector port="8999" protocol="HTTP/1.1"
         connectionTimeout="20000"
@@ -29,6 +31,32 @@ The keys and certificates required for mutual TLS on the repository side are set
     />
     ```
 
+    * If using Alfresco Content Services 7.x on Tomcat 9 or 23.x on Tomcat 10:
+
+    ```bash
+    <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>
+    ```
+
 2. Copy the keystore and truststore files you created in [Generating secure keys for ssl communication]({% link search-services/latest/config/keys.md %}#generating-secure-keys-for-ssl-communication) to the machine that's running the repository.
 
 3. Set the parameters in the connector, replacing the `xxxxxxx` and `yyyyy` values.

From 2faa7266776da17181ecb8b0e4b5eedd31e4db52 Mon Sep 17 00:00:00 2001
From: Monika Michalska <153922997+monikamichalska@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:48:36 +0100
Subject: [PATCH 2/3] [MNT-24158] Update code to match the context

---
 search-services/latest/config/security.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/search-services/latest/config/security.md b/search-services/latest/config/security.md
index 24b9a9fe5e..869617deae 100644
--- a/search-services/latest/config/security.md
+++ b/search-services/latest/config/security.md
@@ -34,7 +34,7 @@ The keys and certificates required for mutual TLS on the repository side are set
     * If using Alfresco Content Services 7.x on Tomcat 9 or 23.x on Tomcat 10:
 
     ```bash
-    <Connector port="8443"
+    <Connector port="8999"
            protocol="org.apache.coyote.http11.Http11NioProtocol"
            connectionTimeout="20000"
            maxThreads="150"
@@ -45,13 +45,13 @@ The keys and certificates required for mutual TLS on the repository side are set
 	    <SSLHostConfig hostName="localhost"
 	               protocols="TLSv1.2"
 	               certificateVerification="required"
-	               truststoreFile="/usr/local/tomcat/alf_data/keystore/ssl.truststore"
-	               truststorePassword="truststore"
+	               truststoreFile="xxxxxxx"
+	               truststorePassword="yyyyy"
 	               truststoreType="JCEKS">
-		    <Certificate certificateKeystoreFile="/usr/local/tomcat/alf_data/keystore/ssl.keystore"
+		    <Certificate certificateKeystoreFile="xxxxxxx"
 		             certificateKeyAlias="ssl.repo"
 		             type="RSA"
-		             certificateKeystorePassword="keystore"
+		             certificateKeystorePassword="yyyyy"
 		             certificateKeystoreType="JCEKS"/>
 	    </SSLHostConfig>
     </Connector>

From 211fde57bb55cf7c1f149fbdf712149a44a70618 Mon Sep 17 00:00:00 2001
From: Adelaide Nxumalo <27953420+anxumalo@users.noreply.github.com>
Date: Thu, 14 Nov 2024 18:26:25 +0000
Subject: [PATCH 3/3] Update search-services/latest/config/security.md

---
 search-services/latest/config/security.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/search-services/latest/config/security.md b/search-services/latest/config/security.md
index 869617deae..47bcccd34a 100644
--- a/search-services/latest/config/security.md
+++ b/search-services/latest/config/security.md
@@ -17,7 +17,7 @@ The keys and certificates required for mutual TLS on the repository side are set
 
 1. Modify `<TOMCAT_HOME>/conf/server.xml` and add the following connector:
 
-    * If using Alfresco Content Accelerator 6.x on Tomcat 8:
+    * If using Alfresco Content Services 6.x on Tomcat 8:
 
     ```xml
     <Connector port="8999" protocol="HTTP/1.1"