Merge branch 'master' of https://git.prod.crss.wesm.ph/crss/config into 2.1.x

crss-admin/crss-admin.yml

@@ -18,11 +18,11 @@ spring:
   # TODO: UPDATE configs for prod
   mail:
     subject:
-      prefix: ""
-    host: mailserver.marathon.l4lb.thisdcos.directory
-    port: 3025
-    username: crss@top.crss.wesm.ph
-    password: P@ssw0rd1434412
+      prefix: "[CRSS 2.0 - Trial Operation]"
+    host: 192.168.10.96
+    port: 25
+    username: crss-mailer@wesm.ph
+    password: Cr551234
     properties:
         transport.protocol: smtp
         smtp:
@@ -33,7 +33,7 @@ spring:
 crss:
   ldap:
     protocol: LDAPS
-    host: "192.168.94.94"
+    host: "192.168.41.106"
     port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO

crss-data/crss-data.yml

@@ -26,10 +26,14 @@ crss:
    # TODO: update to oracle datasource once credentials are available
   datawarehouse:
     datasource:
-      platform: postgresql
-      url: jdbc:edb://10.176.11.131:5432/crss_external?currentSchema=datawarehouse
-      username: crss_datawarehouse
-      password: TzvJ6He8
+      platform: oracle
+      url: jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=OFF)(FAILOVER=ON)
+           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.56)(PORT=1521))
+           (ADDRESS=(PROTOCOL=TCP)(HOST=192.168.94.57)(PORT=1521)))
+           (CONNECT_DATA=(SERVICE_NAME=ODAAB)(SERVER=DEDICATED)))
+      username: crss_dw
+      password: crss_dw
+      driverClassName: oracle.jdbc.OracleDriver
       hikari:
         connectionTimeout: 10000
         maximumPoolSize: 5

crss-edge/crss-edge.yml

@@ -86,8 +86,8 @@ hystrix:
 #zuul.host.socket-timeout-millis: 30000
 
 ribbon:
-  ConnectTimeout: 30000
-  ReadTimeout: 60000
+  ConnectTimeout: 300000
+  ReadTimeout: 600000
   maxAutoRetries: 1
   MaxAutoRetriesNextServer: 2
 

crss-metering/crss-metering.yml

@@ -2,10 +2,9 @@ spring:
   profiles:
     include: client-sec,pg-query
   datasource:
-    # temporary datasource credentials for performance testing
-    url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering_perf
-    username: crss_metering_perf
-    password: crss_metering_perf
+    url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=metering
+    username: crss_metering
+    password: Fh7UcXpW
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20

crss-reg/crss-reg.yml

@@ -3,12 +3,13 @@ spring:
     url: jdbc:edb://10.176.11.131:5432/crss?currentSchema=registration
     username: crss_registration
     password: 51UF3JA9
-  xdf-control:
+  #xdf-control:
     # TODO: update to oracle datasource once credentials are available
-    datasource:
-       url: jdbc:edb://10.176.11.131:5432/crss_external?currentSchema=xdfcontrol
-       username: crss_xdfcontrol
-       password: hWnL3d7j
+    #datasource:
+       #url: jdbc:oracle:thin:@//172.16.3.10:1521/DOR
+       #username: DOR_RT
+       #password: DOR_RT
+       #driverClassName: oracle.jdbc.OracleDriver
   profiles.include: audit, client-sec
   jpa:
     properties:
@@ -26,16 +27,16 @@ crss:
   docmgt:
     root-dir: /crss/docmgt
   xdf:
-    client-type: local  # OPTIONS:[local, ftp, sftp]
-    root-folder: /crss/xdf
+    client-type: sftp  # OPTIONS:[local, ftp, sftp]
+    root-folder: /upload/xdf
     auto-create-dir: true
     file-encoding: UTF-8
     file-exists-mode: fail  # OPTIONS:[append, append_no_flush, fail, ignore, replace]
     remote:
-      host: localhost
+      host: sftp.marathon.l4lb.thisdcos.directory
       port: 22
-      username: crss
-      password: crss
+      username: pemc
+      password: 123qwe
 
 feign:
   hystrix:

crss-uaa/crss-uaa-ldap.yml

@@ -1,7 +1,7 @@
 crss:
   ldap:
     protocol: LDAPS
-    host: "192.168.94.94"
+    host: "192.168.41.106"
     port: 636
     root-dn: "dc=wesmsys,dc=local"
     user-search-base: MO,MP,SO

crss-uaa/crss-uaa.yml

@@ -21,12 +21,12 @@ management:
 crss:
   security:
     oauth2:
-      default-redirect-uri: http://crss.prod.crss.wesmsys.local
+      default-redirect-uri: https://crss.wesmsys.local
       auto-approve: true
       authorized-grant-types: authorization_code,refresh_token,password
       access-token-validity-second: 3600
-      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
+      registered-redirect-uris: https://crss.wesmsys.local,https://bsmd.crss.wesmsys.local,http://crss.wesmsys.local,http://bsmd.crss.wesmsys.local
       client:
         client-id: crss
         client-secret: crsssecret
-        scope: openid
+        scope: openid