From 85ddd17cf5b2226802873af01cedcf15a22007a3 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 20 Jan 2015 10:48:52 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- spring-cloud.html | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/spring-cloud.html b/spring-cloud.html index 9b52d58..6b519cb 100644 --- a/spring-cloud.html +++ b/spring-cloud.html @@ -859,11 +859,15 @@ the repository you can set the "spring.cloud.config.server.git.uri" configuration property in the Config Server (e.g. in application.yml). If you set it with a file: prefix it should work from a local repository so you can get started quickly and easily -without a server (it doesn’t matter if it’s not bare because the -Config Server never makes changes to the "remote" repository). To -scale the Config Server up and make it highly available, however, you -would need to have all instances of the server pointing to the same -repository, so only a shared file system would work.

+without a server, but in that case the server operates directly on the +local repository without cloning it (it doesn’t matter if it’s not +bare because the Config Server never makes changes to the "remote" +repository). To scale the Config Server up and make it highly +available, you would need to have all instances of the server pointing +to the same repository, so only a shared file system would work. Even +in that case it is better to use the ssh: protocol for a shared +filesystem repository, so that the server can clone it and use a local +working copy as a cache.

This repository implementation maps the {label} parameter of the @@ -2970,7 +2974,7 @@ username to use for the service).

Add this project as a dependency to any Spring Cloud UI app or REST service and deploy to Cloudfoundry. If you use Spring Cloud Security OAuth2 features this will make them bindable to Cloud Foundry services -instead of enironment properties in oauth2.*. For a UI app you can +instead of enironment properties in spring.oauth2.*. For a UI app you can declare @EnableOAuth2Sso and bind to a service called "sso", and for a service you can add @EnableOAuth2Resource and bind to a service called "resource" (see below for how to change the names).

@@ -3052,7 +3056,7 @@ for Cloud Foundry just sets up default environment properties so that it all just works if you bind to a Cloud Foundry service instance called "sso". The service credentials are mapped to the SSO properties, i.e. (from spring.oauth2.client.*) clientId, clientSecret, -tokenUri, authorizationUri, (and from oauth2.resource.*) +tokenUri, authorizationUri, (and from spring.oauth2.resource.*) userInfoUri, tokenInfoUri, keyValue, keyUri. Refer to the Spring Cloud Security documentation for details of which combinations will work together. The main thing is that in Cloud Foundry you only @@ -3133,7 +3137,7 @@ service or the "resource" service if you have one).