mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
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
This commit is contained in:
commit
c3af82ca62
@ -211,6 +211,8 @@ Alternatively, the SSL trust material can be configured in an <<features#feature
|
||||
bundle: "example"
|
||||
----
|
||||
|
||||
NOTE: The `server.ssl.bundle` property can not be combined with the discrete Java KeyStore or PEM property options under `server.ssl`.
|
||||
|
||||
See {spring-boot-module-code}/web/server/Ssl.java[`Ssl`] for details of all of the supported properties.
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user