Skip to content

Commit daa102c

Browse files
authored
Merge pull request eugenp#11551 from chaos2418/JAVA-8649-2
JAVA-8649: removing bootstrap.properties in spring-cloud-bus module
2 parents 1748878 + e05e8c1 commit daa102c

5 files changed

Lines changed: 18 additions & 14 deletions

File tree

spring-cloud-bus/spring-cloud-config-client/src/main/resources/application.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
---
22
spring:
3+
application:
4+
name: config-client
5+
profiles:
6+
active: development
7+
config:
8+
import: configserver:http://root:s3cr3t@localhost:8888
39
rabbitmq:
410
host: localhost
511
port: 5672
@@ -10,8 +16,12 @@ spring:
1016
enabled: true
1117
refresh:
1218
enabled: true
19+
config:
20+
fail-fast: true
1321
management:
1422
endpoints:
1523
web:
1624
exposure:
17-
include: "*"
25+
include: "*"
26+
security:
27+
enabled: false

spring-cloud-bus/spring-cloud-config-client/src/main/resources/bootstrap.properties

Lines changed: 0 additions & 7 deletions
This file was deleted.

spring-cloud-bus/spring-cloud-config-server/src/main/resources/application.properties

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@ spring.security.user.password=s3cr3t
66
spring.rabbitmq.host=localhost
77
spring.rabbitmq.port=5672
88
spring.rabbitmq.username=guest
9-
spring.rabbitmq.password=guest
9+
spring.rabbitmq.password=guest
10+
11+
encrypt.key-store.location=classpath:/config-server.jks
12+
encrypt.key-store.password=my-s70r3-s3cr3t
13+
encrypt.key-store.alias=config-server-key
14+
encrypt.key-store.secret=my-k34-s3cr3t

spring-cloud-bus/spring-cloud-config-server/src/main/resources/bootstrap.properties

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
spring.application.name=config-client
22
spring.profiles.active=development
3-
spring.config.import=optional:configserver:http://root:s3cr3t@localhost:8888
3+
spring.config.import=optional:configserver:http://root:s3cr3t@localhost:8888

0 commit comments

Comments
 (0)