Skip to content

Commit c3af82c

Browse files
Merge pull request #39616 from wanger26
* pr/39616: Polish "Add note regarding mixing of bundle-based and direct SSL configuration" Add note regarding mixing of bundle-based and direct SSL configuration Closes gh-39616
2 parents e6d9fcd + eb4d6e7 commit c3af82c

File tree

1 file changed

+2
-0
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto

1 file changed

+2
-0
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ Alternatively, the SSL trust material can be configured in an <<features#feature
211211
bundle: "example"
212212
----
213213

214+
NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
215+
214216
See {spring-boot-module-code}/web/server/Ssl.java[`Ssl`] for details of all of the supported properties.
215217

216218

0 commit comments

Comments
 (0)