Merge branch '2.1.x'

application.yml

@@ -51,5 +51,5 @@ graylog:
   host: 10.176.11.123
 
 crss:
-  api.gateway: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080
+  api.gateway: http://edge-server.marathon.l4lb.thisdcos.directory:8080
   security.url: ${crss.api.gateway}/uaa

crss-dataflow-app/crss-dataflow-app-azure.yml

@@ -16,6 +16,14 @@ spring:
   redis:
     host: redis.marathon.l4lb.thisdcos.directory
 
+  # prevent batch job from running on app start
+  batch:
+    job:
+      enabled: false
+    # set to false if spring batch tables are already created
+    initializer:
+      enabled: true
+
 server:
   port: 8082
 

crss-dataflow-app/crss-dataflow-app-dev2.yml

@@ -24,6 +24,9 @@ spring:
   batch:
     job:
       enabled: false
+    # set to false if spring batch tables are already created
+    initializer:
+      enabled: true
 
   redis:
     host: redis.marathon.l4lb.thisdcos.directory

crss-metering/crss-metering.yml

@@ -1,13 +1,13 @@
 spring:
   profiles:
-    include: client-sec
-    datasource:
-      url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering
-      username: crss_metering
-      password: Fh7UcXpW
-      hikari:
-        connectionTimeout: 10000
-        maximumPoolSize: 20
+    include: client-sec,pg-query
+  datasource:
+    url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: Fh7UcXpW
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
   http.multipart:
     enabled: true
     maxFileSize: 3MB

crss-uaa/crss-uaa.yml

@@ -2,9 +2,9 @@ spring:
   profiles:
     include: embedded-ldap
   datasource:
-    url: jdbc:postgresql://localhost:5432/crss?currentSchema=admin
+    url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=admin
     username: crss_admin
-    password: CrssAdmin
+    password: YReYA7fI
   redis:
     database: 1
 
@@ -21,11 +21,11 @@ management:
 crss:
   security:
     oauth2:
-      default-redirect-uri: http://localhost:8087
+      default-redirect-uri: crss.prod.crss.wesmsys.local
       auto-approve: true
       authorized-grant-types: authorization_code,refresh_token,password
       access-token-validity-second: 3600
-      registered-redirect-uris: http://localhost:8087,http://localhost:8089
+      registered-redirect-uris: crss.prod.crss.wesmsys.local,bsmd.prod.crss.wesmsys.local,http://crss.prod.crss.wesmsys.local,http://bsmd.prod.crss.wesmsys.local
       client:
         client-id: crss
         client-secret: crsssecret