Skip to content

Commit

Permalink
config server
Browse files Browse the repository at this point in the history
Signed-off-by: Merric de Launey <mdelauney@pivotal.io>
  • Loading branch information
Brian Vullo authored and MerricdeLauney committed Sep 26, 2018
1 parent 0ebca7e commit 02909fd
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
spring.application.name=allocations-server

server.port=8081
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000

security.basic.enabled=false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spring.application.name=allocations-server
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ spring.application.name=allocations-server
server.port=8181
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_allocations_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000

security.basic.enabled=false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
spring.application.name=backlog-server

server.port=8082
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spring.application.name=backlog-server
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ spring.application.name=backlog-server
server.port=8181
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_backlog_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000

security.basic.enabled=false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
spring.application.name=registration-server

server.port=8083
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server

security.basic.enabled=false
management.security.enabled=false
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spring.application.name=registration-server
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ spring.application.name=registration-server
server.port=8181
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_registration_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server

security.basic.enabled=false
management.security.enabled=false
9 changes: 9 additions & 0 deletions applications/server.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ dependencies {
compile "ch.qos.logback:logback-classic:1.1.11"
compile "org.springframework.boot:spring-boot-starter-actuator"
compile "io.pivotal.spring.cloud:spring-cloud-services-starter-service-registry"
compile "io.pivotal.spring.cloud:spring-cloud-services-starter-config-client"

testCompile project(":components:test-support")
}

bootRun.environment([
"REGISTRATION_SERVER_ENDPOINT": "http://registration-server",
])

test.environment([
"REGISTRATION_SERVER_ENDPOINT": "http://registration-server",
])
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
spring.application.name=timesheets-server

server.port=8084
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_dev?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spring.application.name=timesheets-server
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ spring.application.name=timesheets-server
server.port=8181
spring.datasource.username=tracker
spring.datasource.url=jdbc:mysql://localhost:3306/tracker_timesheets_test?useSSL=false&useTimezone=true&serverTimezone=UTC&useLegacyDatetimeCode=false
registration.server.endpoint=http://registration-server
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=5000

security.basic.enabled=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public void startWithDatabaseName(String dbName) throws IOException, Interrupted
.put("SPRING_DATASOURCE_URL", dbUrl)
.put("EUREKA_CLIENT_ENABLED", "false")
.put("RIBBON_EUREKA_ENABLED", "false")
.put("REGISTRATION_SERVER_ENDPOINT", "http://registration-server")
.put("REGISTRATION_SERVER_RIBBON_LISTOFSERVERS", "http://localhost:8883")
.build());
}
Expand Down
3 changes: 2 additions & 1 deletion manifest-allocations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ applications:
services:
- tracker-allocations-database
- tracker-service-registry
- tracker-circuit-breaker-dashboard
- tracker-circuit-breaker-dashboard
- tracker-config-server
3 changes: 2 additions & 1 deletion manifest-backlog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ applications:
services:
- tracker-backlog-database
- tracker-service-registry
- tracker-circuit-breaker-dashboard
- tracker-circuit-breaker-dashboard
- tracker-config-server
3 changes: 2 additions & 1 deletion manifest-registration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ applications:
instances: 1
services:
- tracker-registration-database
- tracker-service-registry
- tracker-service-registry
- tracker-config-server
1 change: 1 addition & 0 deletions manifest-timesheets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ applications:
- tracker-timesheets-database
- tracker-service-registry
- tracker-circuit-breaker-dashboard
- tracker-config-server

0 comments on commit 02909fd

Please sign in to comment.