From 09fc6d9ee4d823dc1df1c56f92902e230076783f Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Thu, 26 Jan 2017 13:27:28 +0200
Subject: [PATCH] secure configuration server

---
 .../src/main/resources/bootstrap.properties                  | 5 ++++-
 .../src/main/resources/bootstrap.properties                  | 3 +++
 .../spring-cloud-rest/spring-cloud-rest-config/pom.xml       | 4 ++++
 .../src/main/resources/application.properties                | 3 +++
 .../src/main/resources/bootstrap.properties                  | 4 +++-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties
index a5a8eef7b0..2cb3b71ca7 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-1/src/main/resources/bootstrap.properties
@@ -1,6 +1,9 @@
 spring.cloud.config.name=resource
 spring.cloud.config.discovery.service-id=config
 spring.cloud.config.discovery.enabled=true
+spring.cloud.config.username=configUser
+spring.cloud.config.password=configPassword
+
 eureka.client.serviceUrl.defaultZone=http://system:systemPass@localhost:8761/eureka
 
-server.port=8086
\ No newline at end of file
+server.port=8084
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/bootstrap.properties
index ef11a62b53..d6e642afcb 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-client-2/src/main/resources/bootstrap.properties
@@ -1,6 +1,9 @@
 spring.cloud.config.name=resource
 spring.cloud.config.discovery.service-id=config
 spring.cloud.config.discovery.enabled=true
+spring.cloud.config.username=configUser
+spring.cloud.config.password=configPassword
+
 eureka.client.serviceUrl.defaultZone=http://system:systemPass@localhost:8761/eureka
 
 server.port=8085
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
index 20b5eaf908..a6f045899c 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/pom.xml
@@ -34,6 +34,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-eureka</artifactId>
         </dependency>
+        <dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
         
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties
index 5b413e1d96..4071dc81ea 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties
@@ -6,3 +6,6 @@ spring.cloud.config.server.git.uri=${HOME}/application-config
 eureka.client.region = default
 eureka.client.registryFetchIntervalSeconds = 5
 eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka}
+
+security.user.name=configUser
+security.user.password=configPassword
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
index 296078017e..528cb4cfd3 100644
--- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-server/src/main/resources/bootstrap.properties
@@ -1,2 +1,4 @@
 spring.cloud.config.name=spring-cloud-rest-server
-spring.cloud.config.uri=http://localhost:8081
\ No newline at end of file
+spring.cloud.config.uri=http://localhost:8081
+spring.cloud.config.username=configUser
+spring.cloud.config.password=configPassword
\ No newline at end of file