From d99365a4931af0f42647700aa1055c3b61286a04 Mon Sep 17 00:00:00 2001 From: DOHA Date: Wed, 25 Jan 2017 20:35:15 +0200 Subject: [PATCH] Fix configuration --- .../application-config/discovery.properties | 2 ++ .../src/main/resources/application.properties | 8 ++++++++ .../src/main/resources/bootstrap.properties | 3 --- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties delete mode 100644 spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/application-config/discovery.properties b/spring-cloud/spring-cloud-rest/application-config/discovery.properties index 7775cac83a..2f2a56248f 100644 --- a/spring-cloud/spring-cloud-rest/application-config/discovery.properties +++ b/spring-cloud/spring-cloud-rest/application-config/discovery.properties @@ -2,6 +2,8 @@ spring.application.name=discovery server.port=8761 #### cloud +eureka.instance.hostname=localhost +eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} eureka.client.registerWithEureka=false eureka.client.fetchRegistry=false 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 new file mode 100644 index 0000000000..1dd8ca5d13 --- /dev/null +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/application.properties @@ -0,0 +1,8 @@ +server.port=8081 +spring.application.name=config + +spring.cloud.config.server.git.uri=https://github.com/eugenp/tutorials/tree/master/spring-cloud/spring-cloud-rest/application-config + +eureka.client.region = default +eureka.client.registryFetchIntervalSeconds = 5 +eureka.client.serviceUrl.defaultZone=${EUREKA_URI:http://system:systemPass@localhost:8761/eureka} diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties deleted file mode 100644 index f34f1b65ac..0000000000 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config/src/main/resources/bootstrap.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.config.name=resource -spring.cloud.config.discovery.service-id=config -spring.cloud.config.discovery.enabled=true \ No newline at end of file