Skip to content

Commit eb4d6e7

Browse files
Polish "Add note regarding mixing of bundle-based and direct SSL configuration"
See gh-39616
1 parent 4c069f0 commit eb4d6e7

File tree

1 file changed

+4
-1
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto

1 file changed

+4
-1
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ The following example shows setting SSL properties using a Java KeyStore file:
172172
Using configuration such as the preceding example means the application no longer supports a plain HTTP connector at port 8080.
173173
Spring Boot does not support the configuration of both an HTTP connector and an HTTPS connector through `application.properties`.
174174
If you want to have both, you need to configure one of them programmatically.
175-
We recommend using `application.properties` to configure HTTPS, as the HTTP connector is the easier of the two to configure programmatically. Also note that Spring Boot does not support the mixing of different configuration methods of SSL for embedded web servers, as such the use of the `ssl.bundle` property can't be combined with the discrete JKS or PEM property options under `server.ssl`.
175+
We recommend using `application.properties` to configure HTTPS, as the HTTP connector is the easier of the two to configure programmatically.
176+
176177

177178

178179
[[howto.webserver.configure-ssl.pem-files]]
@@ -210,6 +211,8 @@ Alternatively, the SSL trust material can be configured in an <<features#feature
210211
bundle: "example"
211212
----
212213

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

215218

0 commit comments

Comments
 (0)