This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push: new 3aebc0aa10 Clarify requirement is for certificateFile or certificateKeystoreFile 3aebc0aa10 is described below commit 3aebc0aa1007db1b83a6d17edc5146056b1a4beb 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 412cf50ded..5c2f232942 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -1501,7 +1501,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> @@ -1510,6 +1510,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"> @@ -1562,6 +1564,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-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org