From 1908a2f4171d36fd47421c12d3ac3ce7779942bf Mon Sep 17 00:00:00 2001 From: Thibault Vallin Date: Mon, 22 Jul 2024 10:17:40 +0200 Subject: [PATCH] [4.x] Server TLS - Add path key description (#8937) --- README.md | 2 +- docs/src/main/asciidoc/mp/server.adoc | 8 ++++++-- docs/src/main/asciidoc/se/webserver.adoc | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f76cd1ee152..6c366dc2ee7 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ $ mvn validate -Pcopyright $ mvn verify -Pspotbugs ``` -**Documentatonn** +**Documentation** ```bash # At the root of the project diff --git a/docs/src/main/asciidoc/mp/server.adoc b/docs/src/main/asciidoc/mp/server.adoc index 4951dbc3513..e38ebef4346 100644 --- a/docs/src/main/asciidoc/mp/server.adoc +++ b/docs/src/main/asciidoc/mp/server.adoc @@ -183,14 +183,18 @@ server: passphrase: "password" trust-store: true resource: - resource-path: "keystore.p12" + # load from classpath + resource-path: "keystore.p12" # <1> #Keystore with private key and server certificate private-key: keystore: passphrase: "password" resource: - resource-path: "keystore.p12" + # load from file system + path: "/path/to/keystore.p12" # <2> ---- +<1> File loaded from the classpath. +<2> File loaded from the file system. === Configuring additional ports [[conf-additional-ports]] diff --git a/docs/src/main/asciidoc/se/webserver.adoc b/docs/src/main/asciidoc/se/webserver.adoc index e83d9ca6490..c1e8c433395 100644 --- a/docs/src/main/asciidoc/se/webserver.adoc +++ b/docs/src/main/asciidoc/se/webserver.adoc @@ -129,14 +129,19 @@ server: passphrase: "password" trust-store: true resource: - resource-path: "keystore.p12" + # load from classpath + resource-path: "keystore.p12" # <1> # Keystore with private key and server certificate private-key: keystore: passphrase: "password" resource: - resource-path: "keystore.p12" + # load from file system + path: "/path/to/keystore.p12" # <2> ---- +<1> File loaded from classpath. +<2> File loaded from file system. + Then, in your application code, load the configuration from that file. [source,java]