From 52be9217c646d11c9b8f5ebba5fa94f754636618 Mon Sep 17 00:00:00 2001 From: esensar Date: Sun, 16 Apr 2017 21:42:57 +0200 Subject: [PATCH] Prepare for env variables --- config | 2 +- eureka-service/src/main/resources/bootstrap.properties | 8 ++++---- events/src/main/resources/bootstrap.properties | 6 +++--- steleks-proxy/src/main/resources/bootstrap.properties | 6 +++--- teams/src/main/resources/bootstrap.properties | 6 +++--- users/src/main/resources/bootstrap.properties | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config b/config index 74863b5..7d760f0 160000 --- a/config +++ b/config @@ -1 +1 @@ -Subproject commit 74863b5222f054ae8f394f986f4524f29178b40b +Subproject commit 7d760f030f4ad1d8829503796c009f4e107fc491 diff --git a/eureka-service/src/main/resources/bootstrap.properties b/eureka-service/src/main/resources/bootstrap.properties index 8c84d64..ee58255 100644 --- a/eureka-service/src/main/resources/bootstrap.properties +++ b/eureka-service/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ -spring.application.name=steleks-proxy +spring.application.name=eureka-service # N.B. this is the default: -spring.cloud.config.uri=http://localhost:8888 -spring.cloud.config.username=root -spring.cloud.config.password=root \ No newline at end of file +spring.cloud.config.uri=${CONFIG_SERVER_URI:http://localhost:8888} +spring.cloud.config.username=${CONFIG_SERVER_USERNAME:root} +spring.cloud.config.password=${CONFIG_SERVER_PASSWORD:root} \ No newline at end of file diff --git a/events/src/main/resources/bootstrap.properties b/events/src/main/resources/bootstrap.properties index 404808c..ec2c4a8 100644 --- a/events/src/main/resources/bootstrap.properties +++ b/events/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=events # N.B. this is the default: -spring.cloud.config.uri=http://localhost:8888 -spring.cloud.config.username=root -spring.cloud.config.password=root \ No newline at end of file +spring.cloud.config.uri=${CONFIG_SERVER_URI:http://localhost:8888} +spring.cloud.config.username=${CONFIG_SERVER_USERNAME:root} +spring.cloud.config.password=${CONFIG_SERVER_PASSWORD:root} \ No newline at end of file diff --git a/steleks-proxy/src/main/resources/bootstrap.properties b/steleks-proxy/src/main/resources/bootstrap.properties index 8c84d64..78d4616 100644 --- a/steleks-proxy/src/main/resources/bootstrap.properties +++ b/steleks-proxy/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=steleks-proxy # N.B. this is the default: -spring.cloud.config.uri=http://localhost:8888 -spring.cloud.config.username=root -spring.cloud.config.password=root \ No newline at end of file +spring.cloud.config.uri=${CONFIG_SERVER_URI:http://localhost:8888} +spring.cloud.config.username=${CONFIG_SERVER_USERNAME:root} +spring.cloud.config.password=${CONFIG_SERVER_PASSWORD:root} \ No newline at end of file diff --git a/teams/src/main/resources/bootstrap.properties b/teams/src/main/resources/bootstrap.properties index 3576461..eeaa340 100644 --- a/teams/src/main/resources/bootstrap.properties +++ b/teams/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=teams # N.B. this is the default: -spring.cloud.config.uri=http://localhost:8888 -spring.cloud.config.username=root -spring.cloud.config.password=root \ No newline at end of file +spring.cloud.config.uri=${CONFIG_SERVER_URI:http://localhost:8888} +spring.cloud.config.username=${CONFIG_SERVER_USERNAME:root} +spring.cloud.config.password=${CONFIG_SERVER_PASSWORD:root} \ No newline at end of file diff --git a/users/src/main/resources/bootstrap.properties b/users/src/main/resources/bootstrap.properties index 2fb44bd..8b2f30b 100644 --- a/users/src/main/resources/bootstrap.properties +++ b/users/src/main/resources/bootstrap.properties @@ -1,5 +1,5 @@ spring.application.name=users # N.B. this is the default: -spring.cloud.config.uri=http://localhost:8888 -spring.cloud.config.username=root -spring.cloud.config.password=root +spring.cloud.config.uri=${CONFIG_SERVER_URI:http://localhost:8888} +spring.cloud.config.username=${CONFIG_SERVER_USERNAME:root} +spring.cloud.config.password=${CONFIG_SERVER_PASSWORD:root}