Eureka configurations updated

fdanismaz · fdanismaz · commit 0ed9eadfb09f · 2019-07-22T17:35:20.000+03:00
diff --git a/eureka/eureka-client/src/main/resources/application.yml b/eureka/eureka-client/src/main/resources/application.yml
@@ -8,8 +8,11 @@ server:
     contextPath: /test
 
 eureka:
+  server:
+    host: localhost:8761
+    contextPath: serviceregistry
   client:
     serviceUrl:
-      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}
+      defaultZone: ${EUREKA_URI:http://${eureka.server.host}/${eureka.server.contextPath}/eureka}
   instance:
     preferIpAddress: true
diff --git a/eureka/eureka-feign-client/src/main/resources/application.yml b/eureka/eureka-feign-client/src/main/resources/application.yml
@@ -11,6 +11,11 @@ server:
   port: 8080
 
 eureka:
+  server:
+    host: localhost:8761
+    contextPath: serviceregistry
   client:
     serviceUrl:
-      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka}
+      defaultZone: ${EUREKA_URI:http://${eureka.server.host}/${eureka.server.contextPath}/eureka}
+  instance:
+    preferIpAddress: true
diff --git a/eureka/eureka-server/src/main/resources/application.yml b/eureka/eureka-server/src/main/resources/application.yml
@@ -1,20 +1,18 @@
 server:
   port: 8761
-
-server:
   servlet:
     contextPath: /serviceregistry
 
 # Standalone configuration
 eureka:
   instance:
-    hostname: registry
+    hostname: localhost
   client:
     register-with-eureka: false
     fetch-registry: false
     serviceUrl:
       # default zone points to self
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+      defaultZone: http://${eureka.instance.hostname}:${server.port}/${server.contextPath}/eureka/
 
 
 logging:
