From 4c069f0079676c62134f8401886bc5bed17e8ebf Mon Sep 17 00:00:00 2001 From: Jakob Wanger Date: Mon, 19 Feb 2024 17:24:23 -0500 Subject: [PATCH] Add note regarding mixing of bundle-based and direct SSL configuration Signed-off-by: Jakob Wanger See gh-39616 --- .../spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc index e1b98ecd29d..c6a5e470929 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto/webserver.adoc @@ -172,8 +172,7 @@ The following example shows setting SSL properties using a Java KeyStore file: Using configuration such as the preceding example means the application no longer supports a plain HTTP connector at port 8080. Spring Boot does not support the configuration of both an HTTP connector and an HTTPS connector through `application.properties`. If you want to have both, you need to configure one of them programmatically. -We recommend using `application.properties` to configure HTTPS, as the HTTP connector is the easier of the two to configure programmatically. - +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`. [[howto.webserver.configure-ssl.pem-files]]