Bladeren bron

update dataflow props dev2

jdogillo 8 jaren geleden
bovenliggende
commit
19304bbe3f
1 gewijzigde bestanden met toevoegingen van 8 en 53 verwijderingen
  1. 8 53
      crss-dataflow-app/crss-dataflow-app-dev2.yml

+ 8 - 53
crss-dataflow-app/crss-dataflow-app-dev2.yml

@@ -1,24 +1,20 @@
 spring:
   crss-dataflow:
     datasource:
+      driverClassName: ${spring.datasource.driverClassName}
       jdbcUrl: jdbc:postgresql://192.168.233.9:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: crss_dataflow
-      driverClassName: org.postgresql.Driver
-      maxPoolSize: 2
-      connectionTimeout: 10000
-      test-on-borrow: true
-      validation-query: SELECT 1
   jpa:
     show-sql: true
-    generate-ddl: false
+    generate-ddl: true
     properties:
       hibernate:
-        generate_statistics: true
-        dialect: org.hibernate.dialect.PostgreSQLDialect
-        ddl-auto: none
         hbm2ddl:
-          import_files:
+          auto: none
+
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory
 
   # prevent batch job from running on app start
   batch:
@@ -28,55 +24,14 @@ spring:
     initializer:
       enabled: true
 
-  redis:
-    host: redis.marathon.l4lb.thisdcos.directory
-    port: 6379
-
-#liquibase:
-#  change-log: classpath:/db/db.changelog-master.xml
-
 server:
   port: 8082
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
-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
-
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: DEBUG
-    org.springframework.cloud: DEBUG
-    org.apache.http: DEBUG
-    org.hibernate.type: trace
-    org.hibernate.stat: debug
 
 dataflow:
   url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
 
 sftp:
   credentials:
-    username: pemc
-    password: 123qwe
-    host: pemc-storage.southeastasia.cloudapp.azure.com
-    port: 22
-    workingDirectory: /home/pemc/upload
-    privateKey:
-
-# temporary todi-config, to be moved to general config
-todi-config:
-  dispatch-interval: 5
+    host: sftp.marathon.l4lb.thisdcos.directory
+    workingDirectory: /upload