Renaming the config files so that only one is picked up, i.e. no over…

…riding from application.yaml
aowss · Apr 15, 2024 · afc6e98 · afc6e98
1 parent ec94cec
commit afc6e98
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/...dling/src/main/resources/application.yaml → ...src/main/resources/application-cloud.yaml b/...dling/src/main/resources/application.yaml → ...src/main/resources/application-cloud.yaml
@@ -1,3 +1,6 @@
+server:
+  port: 9000
+
 # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection
 # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options
 

diff --git a/spring-boot/error-handling/src/main/resources/application-local.yaml b/spring-boot/error-handling/src/main/resources/application-local.yaml
@@ -1,3 +1,6 @@
+server:
+  port: 9000
+
 zeebe:
   client:
     broker:

diff --git a/...ector/src/main/resources/application.yaml → ...src/main/resources/application-cloud.yaml b/...ector/src/main/resources/application.yaml → ...src/main/resources/application-cloud.yaml
@@ -1,3 +1,9 @@
+server:
+  port: 9000
+
+api:
+  url: http://${ENV:prod}-rates:9999/exchangeRates
+
 # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection
 # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options
 
@@ -16,6 +22,3 @@ camunda:
       enabled: false
     webhook:
       enabled: false
-
-api:
-  url: http://${ENV:prod}-rates:9999/exchangeRates
diff --git a/spring-boot/rest-connector/src/main/resources/application-local.yaml b/spring-boot/rest-connector/src/main/resources/application-local.yaml
@@ -1,3 +1,9 @@
+server:
+  port: 9000
+
+api:
+  url: http://${ENV:prod}-rates:9999/exchangeRates
+
 zeebe:
   client:
     broker:
@@ -16,6 +22,3 @@ camunda:
       enabled: false
     webhook:
       enabled: false
-
-api:
-  url: http://${ENV:prod}-rates:9999/exchangeRates
diff --git a/.../task/src/main/resources/application.yaml → ...src/main/resources/application-cloud.yaml b/.../task/src/main/resources/application.yaml → ...src/main/resources/application-cloud.yaml
@@ -1,3 +1,9 @@
+server:
+  port: 9000
+
+api:
+  url: http://${ENV:prod}-rates:9999/exchangeRates
+
 # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection
 # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options
 
@@ -14,6 +20,3 @@ tasklist:
   keycloak-url: https://login.cloud.camunda.io/oauth/token
   client-id: ${zeebe.client.cloud.clientId}
   client-secret: ${zeebe.client.cloud.clientSecret}
-
-api:
-  url: http://${ENV:prod}-rates:9999/exchangeRates
diff --git a/spring-boot/task/src/main/resources/application-local.yaml b/spring-boot/task/src/main/resources/application-local.yaml
@@ -1,3 +1,9 @@
+server:
+  port: 9000
+
+api:
+  url: http://${ENV:prod}-rates:9999/exchangeRates
+
 # https://github.com/camunda-community-hub/spring-zeebe#configuring-camunda-platform-8-saas-connection
 # https://github.com/camunda-community-hub/spring-zeebe#additional-configuration-options
 
@@ -24,6 +30,3 @@ camunda:
       enabled: false
     webhook:
       enabled: false
-
-api:
-  url: http://${ENV:prod}-rates:9999/exchangeRates