From 2731ba12bf17633dda78440ce91490b0ee60a214 Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 1 Mar 2021 22:51:47 -0500 Subject: [PATCH 1/3] fix documentation bug --- docs/src/main/asciidoc/quickstart.adoc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc index ab1bd239..eacba9bd 100644 --- a/docs/src/main/asciidoc/quickstart.adoc +++ b/docs/src/main/asciidoc/quickstart.adoc @@ -43,13 +43,23 @@ The mini-application's `Environment` is used to enumerate property sources and p The HTTP service has resources in the following form: ---- -/{application}/{profile}[/{label}] +/{application}/[{profile}]/{label} /{application}-{profile}.yml /{label}/{application}-{profile}.yml /{application}-{profile}.properties /{label}/{application}-{profile}.properties ---- +For example: + +---- +curl localhost:8888/foo/development/master +curl localhost:8888/foo/development,db/master +curl localhost:8888/foo-development.yml +curl localhost:8888/foo-db.properties +curl localhost:8888/master/foo-db.properties +---- + where `application` is injected as the `spring.config.name` in the `SpringApplication` (what is normally `application` in a regular Spring Boot app), `profile` is an active profile (or comma-separated list of properties), and `label` is an optional git label (defaults to `master`.) Spring Cloud Config Server pulls configuration for remote clients from various sources. The following example gets configuration from a git repository (which must be provided), as shown in the following example: From 3de60453951d24ab4bb1e8590d2941479895ddcf Mon Sep 17 00:00:00 2001 From: Eugene Date: Wed, 3 Mar 2021 14:45:57 -0400 Subject: [PATCH 2/3] minor additions --- docs/src/main/asciidoc/quickstart.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc index eacba9bd..acd1e104 100644 --- a/docs/src/main/asciidoc/quickstart.adoc +++ b/docs/src/main/asciidoc/quickstart.adoc @@ -43,7 +43,8 @@ The mini-application's `Environment` is used to enumerate property sources and p The HTTP service has resources in the following form: ---- -/{application}/[{profile}]/{label} +/{application}/{profile} +/{application}/{profile}/{label} /{application}-{profile}.yml /{label}/{application}-{profile}.yml /{application}-{profile}.properties @@ -53,6 +54,7 @@ The HTTP service has resources in the following form: For example: ---- +curl localhost:8888/foo/development curl localhost:8888/foo/development/master curl localhost:8888/foo/development,db/master curl localhost:8888/foo-development.yml From 0e316fe487f0eaa94391f0d23234e598d33ca3e5 Mon Sep 17 00:00:00 2001 From: Eugene Date: Wed, 3 Mar 2021 14:50:34 -0400 Subject: [PATCH 3/3] revert the previous changes --- docs/src/main/asciidoc/quickstart.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc index acd1e104..12274dce 100644 --- a/docs/src/main/asciidoc/quickstart.adoc +++ b/docs/src/main/asciidoc/quickstart.adoc @@ -43,8 +43,7 @@ The mini-application's `Environment` is used to enumerate property sources and p The HTTP service has resources in the following form: ---- -/{application}/{profile} -/{application}/{profile}/{label} +/{application}/{profile}[/{label}] /{application}-{profile}.yml /{label}/{application}-{profile}.yml /{application}-{profile}.properties