ajustement des configurations

diogene · Nov 26, 2019 · 180e9fd · 180e9fd
1 parent 6adf8c6
commit 180e9fd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 26 deletions.
diff --git a/config/src/main/resources/application.yml b/config/src/main/resources/application.yml
@@ -30,4 +30,5 @@ management:
     metrics:
       enabled: true
     prometheus:
-      enabled: true
+      enabled: true
+  context-path: /
diff --git a/config/src/main/resources/shared/account-service.yml b/config/src/main/resources/shared/account-service.yml
@@ -25,8 +25,8 @@ eureka:
 server:
   servlet:
     context-path: /accounts
-  port: 6321
+  port: 0
 
 feign:
   hystrix:
-    enabled: true
+    enabled: true
diff --git a/config/src/main/resources/shared/application.yml b/config/src/main/resources/shared/application.yml
@@ -26,12 +26,6 @@ security:
 spring:
   rabbitmq:
     host: rabbitmq
-  boot:
-    admin:
-      client:
-          enabled: true
-          url: http://${ADMIN_SERVER:admin}:8080
-
 
 management:
   security:
@@ -50,4 +44,4 @@ management:
     metrics:
       enabled: true
     prometheus:
-      enabled: true
+      enabled: true
diff --git a/config/src/main/resources/shared/auth-service.yml b/config/src/main/resources/shared/auth-service.yml
@@ -6,10 +6,6 @@ spring:
       password: ${MONGODB_PASSWORD}
       database: piggymetrics
       port: ${MONGODB_AUTH_PORT:27017}
-  boot:
-    admin:
-      discovery:
-        converter.management-context-path: '/uaa/actuator'
 
 eureka:
   instance:
@@ -20,6 +16,3 @@ server:
   servlet:
     context-path: /uaa
   port: 5000
-
-management:
-  context-path: /uaa/actuator
diff --git a/config/src/main/resources/shared/notification-service.yml b/config/src/main/resources/shared/notification-service.yml
@@ -15,7 +15,7 @@ eureka:
 server:
   servlet:
     context-path: /notifications
-  port: 8000
+  port: 0
 
 remind:
   cron: 0 0 0 * * *

diff --git a/config/src/main/resources/shared/statistics-service.yml b/config/src/main/resources/shared/statistics-service.yml
@@ -28,15 +28,8 @@ eureka:
 server:
   servlet:
     context-path: /statistics
-  port: 7000
+  port: 0
 
 rates:
   url: https://api.exchangeratesapi.io
 
-
-management.security.enabled: false  
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"