From bbe830646113107980d116ac2340417da4722710 Mon Sep 17 00:00:00 2001
From: Szakalakamaka <rafzukow@gmail.com>
Date: Thu, 15 Oct 2020 13:20:22 +0200
Subject: [PATCH] testing cloud configurations

---
 .idea/workspace.xml                       | 42 ++++++++++++-----------
 src/main/resources/application.properties |  7 ++--
 target/classes/application.properties     |  4 +++
 target/classes/bootstrap.properties       |  2 --
 target/classes/bootstrap.yml              | 23 -------------
 5 files changed, 31 insertions(+), 47 deletions(-)
 delete mode 100644 target/classes/bootstrap.properties
 delete mode 100644 target/classes/bootstrap.yml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f430140..d9df1dd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -23,9 +23,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -265,13 +267,6 @@
       <option name="presentableId" value="Default" />
       <updated>1598862102028</updated>
     </task>
-    <task id="LOCAL-00059" summary="adding logs from the application">
-      <created>1601297895444</created>
-      <option name="number" value="00059" />
-      <option name="presentableId" value="LOCAL-00059" />
-      <option name="project" value="LOCAL" />
-      <updated>1601297895444</updated>
-    </task>
     <task id="LOCAL-00060" summary="clean before the build">
       <created>1601300366399</created>
       <option name="number" value="00060" />
@@ -608,7 +603,14 @@
       <option name="project" value="LOCAL" />
       <updated>1602755704407</updated>
     </task>
-    <option name="localTasksCounter" value="108" />
+    <task id="LOCAL-00108" summary="testing cloud configurations">
+      <created>1602757104849</created>
+      <option name="number" value="00108" />
+      <option name="presentableId" value="LOCAL-00108" />
+      <option name="project" value="LOCAL" />
+      <updated>1602757104849</updated>
+    </task>
+    <option name="localTasksCounter" value="109" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -696,41 +698,41 @@
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602062761111" />
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602747357420" />
     <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
-    <state width="1877" height="386" key="GridCell.Tab.0.bottom" timestamp="1602756657046">
+    <state width="1877" height="386" key="GridCell.Tab.0.bottom" timestamp="1602758063712">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
     <state width="1493" height="274" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
-    <state width="1877" height="386" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602756657046" />
+    <state width="1877" height="386" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602758063712" />
     <state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="386" key="GridCell.Tab.0.center" timestamp="1602756657045">
+    <state width="1877" height="386" key="GridCell.Tab.0.center" timestamp="1602758063712">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424968" />
     <state width="1493" height="274" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
-    <state width="1877" height="386" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602756657045" />
+    <state width="1877" height="386" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602758063712" />
     <state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="386" key="GridCell.Tab.0.left" timestamp="1602756657045">
+    <state width="1877" height="386" key="GridCell.Tab.0.left" timestamp="1602758063712">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424967" />
     <state width="1493" height="274" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
-    <state width="1877" height="386" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602756657045" />
+    <state width="1877" height="386" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602758063712" />
     <state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
-    <state width="1877" height="386" key="GridCell.Tab.0.right" timestamp="1602756657045">
+    <state width="1877" height="386" key="GridCell.Tab.0.right" timestamp="1602758063712">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
     <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1602249237084" />
     <state width="1877" height="261" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255424969" />
     <state width="1493" height="274" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602752975306" />
-    <state width="1877" height="386" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602756657045" />
+    <state width="1877" height="386" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602758063712" />
     <state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
     <state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817">
       <screen x="1920" y="0" width="1920" height="1160" />
@@ -778,14 +780,14 @@
     </state>
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
     <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1602755708926">
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1602757106630">
       <screen x="1920" y="0" width="1920" height="1160" />
     </state>
     <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600350277680" />
     <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1602255416393" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602747980842" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602755708926" />
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1602757106630" />
     <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
     <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
       <screen x="1920" y="0" width="1920" height="1040" />
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4071bd9..b11c183 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -15,8 +15,11 @@ spring.cloud.config.retry.max-intervals = 1000
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
 
-eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
-
+eureka.instance.preferIpAddress = true
+eureka.instance.hostname = klaus
+eureka.client.registerWithEureka = true
+eureka.client.fetchRegistry = true
+eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
 
 #logging:
 spring.output.ansi.enabled = always
diff --git a/target/classes/application.properties b/target/classes/application.properties
index 4071bd9..cace0d9 100644
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -15,6 +15,10 @@ spring.cloud.config.retry.max-intervals = 1000
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
 
+eureka.instance.preferIpAddress = true
+eureka.instance.hostname = klaus
+eureka.client.registerWithEureka = true
+eureka.client.fetchRegistry = true
 eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
 
 
diff --git a/target/classes/bootstrap.properties b/target/classes/bootstrap.properties
deleted file mode 100644
index d223817..0000000
--- a/target/classes/bootstrap.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
-
diff --git a/target/classes/bootstrap.yml b/target/classes/bootstrap.yml
deleted file mode 100644
index 87d10e9..0000000
--- a/target/classes/bootstrap.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://netflix:eureka@localhost:8761/eureka/
-
-spring:
-  application:
-    name: klaus
-  profiles:
-    active: DEV
-  cloud:
-    config:
-      discovery:
-        enabled: true
-        service-id: klaus-config-service
-      fail-fast: true
-      retry:
-        initial-interval: 1500
-        multiplier: 1.5
-        max-attempts: 10000
-        max-interval: 1000
-server:
-  port: 8097