[tomcat] branch main updated: Clarify requirement is for certificateFile or certificateKeystoreFile

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new ee7e56fd43 Clarify requirement is for certificateFile or certificateKeystoreFile
ee7e56fd43 is described below

commit ee7e56fd433830769e1c7d46a55da6751229d90e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 11 09:41:26 2022 +0100

    Clarify requirement is for certificateFile or certificateKeystoreFile
---
 webapps/docs/config/http.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 1cee41818e..890bf7dcef 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1420,7 +1420,7 @@
 
   <attributes>
 
-    <attribute name="certificateFile" required="true">
+    <attribute name="certificateFile" required="false">
       <p>Name of the file that contains the server certificate. The format is
       PEM-encoded. Relative paths will be resolved against
       <code>$CATALINA_BASE</code>.</p>
@@ -1429,6 +1429,8 @@
       generated by <code>openssl dhparam</code> and <code>openssl ecparam</code>,
       respectively. The output of the respective OpenSSL command can simply
       be concatenated to the certificate file.</p>
+      <p>This attribute is required unless
+      <strong>certificateKeystoreFile</strong> is specified.</p>
     </attribute>
 
     <attribute name="certificateChainFile" required="false">
@@ -1481,6 +1483,8 @@
       When using a domain keystore (<code>keystoreType</code> of
       <code>DKS</code>), this parameter should be the URI to the domain
       keystore.</p>
+      <p>This attribute is required unless
+      <strong>certificateFile</strong> is specified.</p>
     </attribute>
 
     <attribute name="certificateKeystorePassword" required="false">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org