Skip to content

S
spring-boot
Commit 6c401324 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents 77e5c585 58a4f049
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View file @ 6c401324
......@@ -651,7 +651,7 @@ management server to be available via HTTP while the main application uses HTTPS
server.ssl.key-store=classpath:store.jks
server.ssl.key-password=secret
management.port=8080
management.ssl.enable=false
management.ssl.enabled=false
----
Alternatively, both the main server and the management server can use SSL but with
......@@ -664,7 +664,7 @@ different key stores:
server.ssl.key-store=classpath:main.jks
server.ssl.key-password=secret
management.port=8080
management.ssl.enable=true
management.ssl.enabled=true
management.ssl.key-store=classpath:management.jks
management.ssl.key-password=secret
----
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment