This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 834c0c5a9a Clarify requirement is for certificateFile or
certificateKeystoreFile
834c0c5a9a is described below
commit 834c0c5a9a0f8c5a7150eaf9222bce6a13a7f781
Author: Mark Thomas <[email protected]>
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 fb311aa849..2942b8a245 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1528,7 +1528,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>
@@ -1537,6 +1537,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">
@@ -1589,6 +1591,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: [email protected]
For additional commands, e-mail: [email protected]
