Browse Source

cleanup dataflow-app config

Jejomar Dimayuga 8 years ago
parent
commit
5b2a8be9c4

+ 8 - 6
crss-dataflow-app/crss-dataflow-app-dev.yml

@@ -1,20 +1,22 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_dataflow
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
+      username: postgres
+      password: postgres
+      driverClassName: org.postgresql.Driver
   jpa:
     show-sql: true
 
   redis:
-    host: redis.marathon.l4lb.thisdcos.directory
+    host: localhost
+    port: 6379
 
 server:
-  port: 8082
+  port: 9092
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://localhost:9393
 
 security:
   basic:

+ 1 - 9
crss-dataflow-app/crss-dataflow-app-dev2.yml

@@ -4,14 +4,7 @@ spring:
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss_dataflow
       username: crss_dataflow
       password: crss_dataflow
-  jpa:
-    show-sql: true
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-server:
-  port: 8082
+      driverClassName: org.postgresql.Driver
 
 security:
   oauth2:
@@ -21,7 +14,6 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-
 logging:
   level:
     org.hibernate.type: trace

+ 1 - 11
crss-dataflow-app/crss-dataflow-app-pemc-uat-default.yml

@@ -4,20 +4,10 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_uat?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
+      driverClassName: org.postgresql.Driver
   redis:
     database: 5
 
-server:
-  port: 8082
-
 security:
   oauth2:
     client:

+ 1 - 11
crss-dataflow-app/crss-dataflow-app-pemc-uat-sit.yml

@@ -4,20 +4,10 @@ spring:
       jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_sit?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
+      driverClassName: org.postgresql.Driver
   redis:
     database: 4
 
-server:
-  port: 8082
-
 security:
   oauth2:
     client:

+ 0 - 35
crss-dataflow-app/crss-dataflow-app-pemc-uat.yml

@@ -1,35 +0,0 @@
-spring:
-  crss-dataflow:
-    datasource:
-      jdbcUrl: jdbc:postgresql://10.176.23.24:5432/crss_dataflow
-      username: crss_dataflow
-      password: crss_dataflow
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-server:
-  port: 8082
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
-    resource:
-      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
-
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
-sftp:
-  credentials:
-    host: sftp.marathon.l4lb.thisdcos.directory
-    workingDirectory: /upload

+ 1 - 17
crss-dataflow-app/crss-dataflow-app-qa.yml

@@ -4,20 +4,7 @@ spring:
       jdbcUrl: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_dataflow
       username: admin
       password: password
-      maxPoolSize: 5
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-server:
-  port: 8082
+      driverClassName: org.postgresql.Driver
 
 security:
   oauth2:
@@ -27,9 +14,6 @@ security:
     resource:
       userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
 
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory

+ 1 - 14
crss-dataflow-app/crss-dataflow-app-top-sit.yml

@@ -4,19 +4,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss_sit?currentSchema=dataflow
       username: crss_sit_dataflow
       password: uYgE8bqG
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-server:
-  port: 8082
 
 security:
   oauth2:
@@ -27,7 +14,7 @@ security:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://crss-top-sitspring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:

+ 0 - 16
crss-dataflow-app/crss-dataflow-app-top.yml

@@ -4,19 +4,6 @@ spring:
       jdbcUrl: jdbc:edb://10.176.11.23:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
-  jpa:
-    show-sql: true
-    generate-ddl: true
-    properties:
-      hibernate:
-        hbm2ddl:
-          auto: none
-
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-
-server:
-  port: 8082
 
 security:
   oauth2:
@@ -26,9 +13,6 @@ security:
     resource:
       userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
-dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
-
 sftp:
   credentials:
     host: sftp.marathon.l4lb.thisdcos.directory

+ 4 - 11
crss-dataflow-app/crss-dataflow-app.yml

@@ -1,10 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://localhost:5432/crss_dataflow
-      username: postgres
-      password: postgres
-      driverClassName: org.postgresql.Driver
+      driverClassName: com.edb.Driver
       connectionTimeout: 10000
       maxPoolSize: 2
       test-on-borrow: true
@@ -14,7 +11,7 @@ spring:
     generate-ddl: false
     properties:
       hibernate:
-        generate_statistics: true
+        generate_statistics: false
         dialect: org.hibernate.dialect.PostgreSQLDialect
         ddl-auto: none
         hbm2ddl:
@@ -25,15 +22,11 @@ spring:
     job:
       enabled: false
 
-  redis:
-    host: localhost
-    port: 6379
-
 #liquibase:
 #  change-log: classpath:/db/db.changelog-master.xml
 
 server:
-  port: 9092
+  port: 8082
   undertow:
     accesslog:
       dir: target
@@ -52,7 +45,7 @@ logging:
     org.hibernate.stat: debug
 
 dataflow:
-  url: http://localhost:9393
+  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials: