From fd953656f59759d6ab7646006d10fb29e2ce9275 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 20 Oct 2017 21:25:13 +0000 Subject: [PATCH] Sync docs from 2.0.x to gh-pages --- 2.0.x/multi/multi__serving_plain_text.html | 4 ++-- 2.0.x/single/spring-cloud-config.html | 4 ++-- 2.0.x/spring-cloud-config.xml | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/2.0.x/multi/multi__serving_plain_text.html b/2.0.x/multi/multi__serving_plain_text.html index 79c5d82e..1d2e02af 100644 --- a/2.0.x/multi/multi__serving_plain_text.html +++ b/2.0.x/multi/multi__serving_plain_text.html @@ -33,8 +33,8 @@ nginx.conf

where nginx.conf looks like this }

and /foo/development/master/nginx.conf like this:

server {
     listen              80;
     server_name         develop.com;
-}
[Note]Note

just like the source files for environment configuration, the +}

[Note]Note

Just like the source files for environment configuration, the "profile" is used to resolve the file name, so if you want a profile-specific file then /*/development/*/logback.xml will be resolved by a file called logback-development.xml (in preference -to logback.xml).

Prev   Next
3. Serving Alternative Formats Home 5. Embedding the Config Server
\ No newline at end of file +to logback.xml).

[Note]Note

If you do not want to supply the label and let the server use the default label, you can supply a useDefaultLabel request parameter. So, the above example for the default profile could look like /foo/default/nginx.conf?useDefaultLabel.

Prev   Next
3. Serving Alternative Formats Home 5. Embedding the Config Server
\ No newline at end of file diff --git a/2.0.x/single/spring-cloud-config.html b/2.0.x/single/spring-cloud-config.html index a6981ce4..7b4ec9d1 100644 --- a/2.0.x/single/spring-cloud-config.html +++ b/2.0.x/single/spring-cloud-config.html @@ -730,11 +730,11 @@ nginx.conf

where nginx.conf looks like this }

and /foo/development/master/nginx.conf like this:

server {
     listen              80;
     server_name         develop.com;
-}
[Note]Note

just like the source files for environment configuration, the +}

[Note]Note

Just like the source files for environment configuration, the "profile" is used to resolve the file name, so if you want a profile-specific file then /*/development/*/logback.xml will be resolved by a file called logback-development.xml (in preference -to logback.xml).

5. Embedding the Config Server

The Config Server runs best as a standalone application, but if you +to logback.xml).

[Note]Note

If you do not want to supply the label and let the server use the default label, you can supply a useDefaultLabel request parameter. So, the above example for the default profile could look like /foo/default/nginx.conf?useDefaultLabel.

5. Embedding the Config Server

The Config Server runs best as a standalone application, but if you need to you can embed it in another application. Just use the @EnableConfigServer annotation. An optional property that can be useful in this case is spring.cloud.config.server.bootstrap which is diff --git a/2.0.x/spring-cloud-config.xml b/2.0.x/spring-cloud-config.xml index d7ac9641..6525e606 100644 --- a/2.0.x/spring-cloud-config.xml +++ b/2.0.x/spring-cloud-config.xml @@ -1182,12 +1182,15 @@ nginx: server_name develop.com; } -just like the source files for environment configuration, the +Just like the source files for environment configuration, the "profile" is used to resolve the file name, so if you want a profile-specific file then /*/development/*/logback.xml will be resolved by a file called logback-development.xml (in preference to logback.xml). + +If you do not want to supply the label and let the server use the default label, you can supply a useDefaultLabel request parameter. So, the above example for the default profile could look like /foo/default/nginx.conf?useDefaultLabel. + Embedding the Config Server