Updated urls to use docker compose links

crss-admin-clouddev.yml

@@ -0,0 +1,38 @@
+spring:
+  datasource:
+    platform : postgres
+    url: jdbc:postgresql://db:5432/crss_admin
+    username: crss_admin
+    password: crss_admin
+    driverClassName: org.postgresql.Driver
+  jpa:
+    database: POSTGRESQL
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+    properties:
+      jadira.usertype.autoRegisterUserTypes: true
+      javax.persistence.schema-generation.database.action: none
+      javax.persistence.schema-generation.create-source: metadata
+      javax.persistence.schema-generation.scripts.action: drop-and-create
+      javax.persistence.schema-generation.scripts.create-target: target/create.sql
+      javax.persistence.schema-generation.scripts.drop-target: target/drop.sql
+server:
+  port: 8082
+
+graylog:
+  host: localhost
+
+# crss:
+#   ldap:
+#     embedded: true
+#     protocol: "ldap"
+#     host: "localhost"
+#     port: 33389
+#     root-dn: "dc=wesmsys,dc=local"
+#     ldif: "classpath:embedded-ldap.ldif"
+#     user-search-base: ""
+#     admin-user: "uid=crssadmin,ou=Administrators,dc=wesmsys,dc=local"
+#     admin-password: "1qaz@WSX"
+#     username-field: "uid"
+#     domain: "wesmsys.local"

crss-admin-dev.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     platform : postgres
-    url: jdbc:postgresql://db:5432/crss_admin
+    url: jdbc:postgresql://localhost:5432/crss_admin
     username: crss_admin
     password: crss_admin
     driverClassName: org.postgresql.Driver
@@ -20,18 +20,33 @@ spring:
 server:
   port: 8082
 
-graylog.host: localhost
 
-# crss:
-#   ldap:
-#     embedded: true
-#     protocol: "ldap"
-#     host: "localhost"
-#     port: 33389
-#     root-dn: "dc=wesmsys,dc=local"
-#     ldif: "classpath:embedded-ldap.ldif"
-#     user-search-base: ""
-#     admin-user: "uid=crssadmin,ou=Administrators,dc=wesmsys,dc=local"
-#     admin-password: "1qaz@WSX"
-#     username-field: "uid"
-#     domain: "wesmsys.local"
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8080/oauth/authorize
+    resource:
+      userInfoUri: http://localhost:8082/user
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+
+graylog:
+  host: localhost
+
+crss:
+  ldap:
+    embedded: true
+    protocol: "ldap"
+    host: "localhost"
+    port: 33389
+    root-dn: "dc=wesmsys,dc=local"
+    ldif: "classpath:embedded-ldap.ldif"
+    user-search-base: ""
+    admin-user: "uid=crssadmin,ou=Administrators,dc=wesmsys,dc=local"
+    admin-password: "1qaz@WSX"
+    username-field: "uid"
+    domain: "wesmsys.local"

crss-admin.yml

@@ -9,20 +9,20 @@ spring:
 security:
   oauth2:
     client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      accessTokenUri: http://app:8080/oauth/access_token
+      userAuthorizationUri: http://app:8080/oauth/authorize
       clientId: crss
       clientSecret: crsssecret
       authorized-grant-types: authorization_code,refresh_token,password
       scope: openid
       access-token-validity-seconds: 3600
     resource:
-      userInfoUri: http://localhost:8082/user
+      userInfoUri: http://app:8080/user
 
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
+      defaultZone: http://discovery:8761/eureka/
       #    healthcheck:
       #      enabled: true
     lease: