Преглед на файлове

[admin] Remove duplicate redis config

Monte Cillo Co преди 8 години
родител
ревизия
048e7781aa

+ 2 - 0
crss-admin/crss-admin-dev.yml

@@ -16,6 +16,8 @@ spring:
         smtp:
           auth: true
           starttls.enable: true
+  redis:
+    host: localhost
 
 server:
   port: 8082

+ 0 - 41
crss-admin/crss-admin-pemc-staging.yml

@@ -1,41 +0,0 @@
-spring:
-  profiles:
-    include: embedded-ldap
-  jpa:
-    database: ORACLE
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
-  datasource:
-    platform: oracle
-    url: jdbc:oracle:thin:@//192.168.43.62:1522/STLDB1
-    username: CRSS_ADMIN
-    password: CRSS_ADMIN
-    driverClassName: oracle.jdbc.OracleDriver
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
-  mail:
-    host: 192.168.39.118
-    port: 3025
-    username: crss@staging.pemc.com
-    password: P@ssw0rd1434412
-    properties:
-      mail:
-        transport.protocol: smtp
-        smtp:
-          auth: true
-          starttls.enable: true
-crss:
-  ldap:
-    protocol: "ldap"
-    host: "192.168.1.105"
-    port: 389
-    root-dn: "dc=wesmlocal,dc=dev"
-    user-search-base: ""
-    admin-user: "WESMDEV\\crssadmin"
-    admin-password: "Pemc1234"
-    username-field: "userPrincipalName"
-    domain: "wesmlocal.dev"
-    embedded: false
-    passwordOpEnabled: false

+ 0 - 4
crss-admin/crss-admin-pemc-uat.yml

@@ -1,6 +1,4 @@
 spring:
-  profiles:
-    include: pemc-uat-ldap
   datasource:
     url: jdbc:postgresql://10.176.23.24:5432/crss_admin
     username: crss_admin
@@ -16,8 +14,6 @@ spring:
         smtp:
           auth: true
           starttls.enable: true
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
 crss:
   ldap:
     protocol: LDAPS

+ 0 - 3
crss-admin/crss-admin-ss-combined.yml

@@ -14,9 +14,6 @@ spring:
         smtp:
           auth: true
           starttls.enable: true
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    database: 1
 crss:
   ldap:
     protocol: LDAPS

+ 3 - 1
crss-admin/crss-admin-staging.yml

@@ -15,4 +15,6 @@ spring:
         transport.protocol: smtp
         smtp:
           auth: true
-          starttls.enable: true
+          starttls.enable: true
+  redis:
+    host: redis

+ 0 - 23
crss-admin/crss-admin-uat.yml

@@ -1,23 +0,0 @@
-spring:
-  profiles:
-    include: ldap
-  datasource:
-    url: jdbc:postgresql://192.168.235.6:5432/crss_admin
-    username: crss_admin
-    password: crss_admin
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
-  mail:
-    host: 192.168.235.2
-    port: 3025
-    username: crss@uat.pemc.com
-    password: P@ssw0rd1434412
-    properties:
-      mail:
-        transport.protocol: smtp
-        smtp:
-          auth: true
-          starttls.enable: true
-  redis:
-    host: redis

+ 3 - 3
crss-admin/crss-admin.yml

@@ -1,6 +1,5 @@
 spring:
   profiles.include: audit
-
   http:
     multipart:
       maxFileSize: "25Mb"
@@ -8,11 +7,12 @@ spring:
   resources:
     chain:
       gzipped: true
-
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
+    database: 1
 feign:
   hystrix:
     enabled: false
-
 crss:
   mail:
     signature: