From 8da878bc02918b7ea57fd67158aa4d8901d0c341 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 4 Jun 2018 11:19:36 -0400 Subject: [PATCH 1/2] Document location of spring.cloud.config.server.encrypt.enabled. Fixes 887. --- docs/src/main/asciidoc/spring-cloud-config.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index f4ab6f8a..ec9e15e8 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -1035,9 +1035,9 @@ Sometimes you want the clients to decrypt the configuration locally, instead of doing it in the server. In that case you can still have /encrypt and /decrypt endpoints (if you provide the `encrypt.*` configuration to locate a key), but you need to explicitly switch off -the decryption of outgoing properties using -`spring.cloud.config.server.encrypt.enabled=false`. If you don't care -about the endpoints, then it should work if you configure neither the +the decryption of outgoing properties by placing +`spring.cloud.config.server.encrypt.enabled=false` in `bootstrap.[yml|properties]`. +If you don't care about the endpoints, then it should work if you configure neither the key nor the enabled flag. == Serving Alternative Formats From 484b74b4ed97ab31c1e3620474cc2979b19c7e3d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 4 Jun 2018 11:26:56 -0400 Subject: [PATCH 2/2] encrypt.* properties should be in bootstrap.yml not application.yml. Fixes #895. --- docs/src/main/asciidoc/spring-cloud-config.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index ec9e15e8..27c7ee19 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -980,7 +980,7 @@ $ keytool -genkeypair -alias mytestkey -keyalg RSA \ ---- Put the `server.jks` file in the classpath (for instance) and then in -your `application.yml` for the Config Server: +your `bootstrap.yml` for the Config Server: [source,yaml] ----