From 16b47920d06adb5d8eb5d3f309965b14d4a84af7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Jun 2017 15:00:47 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- spring-cloud-config.html | 69 +++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/spring-cloud-config.html b/spring-cloud-config.html index df6c7613..6257d2ea 100644 --- a/spring-cloud-config.html +++ b/spring-cloud-config.html @@ -527,7 +527,7 @@ from a git repository (which must be provided):

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -550,7 +550,7 @@ users. Example Maven configuration:

 

 
pom.xml

 

-
   <parent>
+
   <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
        <version>1.3.5.RELEASE</version>
@@ -675,7 +675,7 @@ server is easily embeddable in a Spring Boot application using the
 

 
ConfigServer.java

 

-
@SpringBootApplication
+
@SpringBootApplication
 @EnableConfigServer
 public class ConfigServer {
   public static void main(String[] args) {
@@ -695,7 +695,7 @@ to use your own application.properties, e.g.

 

 
application.properties

 

-
server.port: 8888
+
server.port: 8888
 spring.cloud.config.server.git.uri: file://${user.home}/config-repo

 

 

@@ -810,7 +810,7 @@ one wins (like adding entries to a Map).

 

 
bootstrap.yml

 

-
spring:
+
spring:
   application:
     name: foo
   profiles:
@@ -875,7 +875,7 @@ using (for example):

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -899,7 +899,7 @@ quoted). Example:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -948,7 +948,7 @@ to run apps with multiple profiles. Example:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -991,7 +991,7 @@ specified as searchPaths. For example at the top level:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1012,7 +1012,7 @@ at startup. For example at the top level:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1065,7 +1065,7 @@ e.g.

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1136,7 +1136,7 @@ you need it). Example:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1167,7 +1167,7 @@ Example:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1182,7 +1182,7 @@ Example:

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1391,7 +1391,7 @@ values from the Vault backend.  To do this you will need a token for your Vault
 

 

 

-
$ vault write secret/application foo=bar baz=bam
+
$ vault write secret/application foo=bar baz=bam
 $ vault write secret/myapp foo=myappsbar

 

 

@@ -1406,7 +1406,7 @@ $ vault write secret/myapp foo=myappsbar

 

 

 

-
{
+
{
    "name":"myapp",
    "profiles":[
       "default"
@@ -1440,7 +1440,7 @@ For example, assume you have written data to the following paths in Vault.

 

 

 

-
secret/myApp,dev
+
secret/myApp,dev
 secret/myApp
 secret/application,dev
 secret/application

@@ -1500,7 +1500,7 @@ all applications by placing configuration in
 

 

 

-
$ vault write secret/application foo=bar baz=bam

+
$ vault write secret/application foo=bar baz=bam

 

 

 

@@ -1521,7 +1521,7 @@ configuration server.

 

 

 

-
spring:
+
spring:
   profiles:
     active: git, svn
   cloud:
@@ -1595,7 +1595,7 @@ hooks. To declare overrides just add a map of name-value pairs to
 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1650,7 +1650,7 @@ along with custom profiles and custom labels, e.g.

 

 

 

-
spring:
+
spring:
   cloud:
     config:
       server:
@@ -1722,7 +1722,7 @@ instance:

 

 
application.yml

 

-
spring:
+
spring:
   datasource:
     username: dbuser
     password: '{cipher}FKSAJDFGYOS8F7GLHAKERGFHLSAJ'

@@ -1907,7 +1907,7 @@ your application.yml for the Config Server:

 

 

 

-
encrypt:
+
encrypt:
   keyStore:
     location: classpath:/server.jks
     password: letmein
@@ -1930,7 +1930,7 @@ i.e. with a cipher text like this:

 

 

 

-
foo:
+
foo:
   bar: `{cipher}{key:testkey}...`

 

 

@@ -2073,7 +2073,7 @@ nginx.conf

 

 

 

-
nginx:
+
nginx:
   server:
     name: example.com
 ---
@@ -2294,7 +2294,7 @@ for a Config Server that is a Eureka client:

 

 
bootstrap.yml

 

-
eureka:
+
eureka:
   instance:
     ...
     metadataMap:
@@ -2381,7 +2381,7 @@ properties, e.g.

 

 
bootstrap.yml

 

-
spring:
+
spring:
   cloud:
     config:
      uri: https://user:secret@myconfig.mycompany.com

@@ -2393,7 +2393,7 @@ properties, e.g.

 

 
bootstrap.yml

 

-
spring:
+
spring:
   cloud:
     config:
      uri: https://myconfig.mycompany.com
@@ -2415,7 +2415,7 @@ works locally and for a user-provided service on Cloud Foundry named
 

 
bootstrap.yml

 

-
spring:
+
spring:
   cloud:
     config:
      uri: ${vcap.services.configserver.credentials.uri:http://user:password@localhost:8888}

@@ -2450,7 +2450,7 @@ steps below.

 

 
CustomConfigServiceBootstrapConfiguration.java

 

-
@Configuration
+
@Configuration
 public class CustomConfigServiceBootstrapConfiguration {
     @Bean
     public ConfigServicePropertySourceLocator configServicePropertySourceLocator() {
@@ -2473,7 +2473,7 @@ public class CustomConfigServiceBootstrapConfiguration {
 

 
spring.factories

 

-
org.springframework.cloud.bootstrap.BootstrapConfiguration = com.my.config.client.CustomConfigServiceBootstrapConfiguration

+
org.springframework.cloud.bootstrap.BootstrapConfiguration = com.my.config.client.CustomConfigServiceBootstrapConfiguration

 

 

 

@@ -2488,7 +2488,7 @@ in bootstrap.yml.

 

 
bootstrap.yml

 

-
spring:
+
spring:
   cloud:
     config:
       token: YourVaultToken

@@ -2512,7 +2512,7 @@ you would use the traditional dot(.) annotation.  For example

 

 

 

-
@Value("${appA.secret}")
+
@Value("${appA.secret}")
 String name = "World";

 

 

@@ -2524,5 +2524,8 @@ String name = "World";

 

 

 

+
+
+
 
 
\ No newline at end of file