Procházet zdrojové kódy

Organize registration service config

Monte Cillo Co před 9 roky
rodič
revize
97e0a5befd

+ 0 - 37
crss-reg/crss-reg-dev-docker.yml

@@ -1,37 +0,0 @@
-spring:
-  datasource:
-    platform: postgres
-    url: jdbc:postgresql://db:5432/crss_reg
-    username: crss_reg
-    password: crss_reg
-    driverClassName: org.postgresql.Driver
-  jpa:
-    database: POSTGRESQL
-    show-sql: true
-    hibernate:
-      ddl-auto: none
-    properties:
-      jadira.usertype.autoRegisterUserTypes: true
-      javax.persistence.schema-generation.database.action: none
-      javax.persistence.schema-generation.create-source: metadata
-      javax.persistence.schema-generation.scripts.action: drop-and-create
-      javax.persistence.schema-generation.scripts.create-target: create.sql
-      javax.persistence.schema-generation.scripts.drop-target: drop.sql
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: demo.exist.pemc@gmail.com
-    # please provide the password
-    password: $pockTest
-    properties:
-      mail.smtp.auth: true
-      mail.debug: true
-      mail.smtp.starttlls.enable: true
-      mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-
-graylog:
-  host: localhost

+ 4 - 36
crss-reg/crss-reg-dev.yml

@@ -7,47 +7,15 @@ spring:
     driverClassName: org.postgresql.Driver
   jpa:
     database: POSTGRESQL
-    show-sql: false
-    hibernate:
-      ddl-auto: none
     properties:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQL94Dialect
-      jadira.usertype.autoRegisterUserTypes: true
-      javax.persistence.schema-generation.database.action: none
-      javax.persistence.schema-generation.create-source: metadata
-      javax.persistence.schema-generation.scripts.action: drop-and-create
-      javax.persistence.schema-generation.scripts.create-target: create.sql
-      javax.persistence.schema-generation.scripts.drop-target: drop.sql
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: demo.exist.pemc@gmail.com
-    # please provide the password
-    password: $pockTest
-    properties:
-      mail.smtp.auth: true
-      mail.debug: true
-      mail.smtp.starttlls.enable: true
-      mail.smtp.starttls.required: true
-  #we dont need spring mvc here
+   #we dont need spring mvc here
   freemarker:
     enabled: false
     template-loader-path: classpath:/mail/templates
 server:
   port: 8081
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8082/oauth/authorize
-    resource:
-      userInfoUri: http://localhost:8082/user
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
-graylog:
-  host: localhost
+app:
+  docmgt:
+    root-folder: target/crss/docmgt

+ 0 - 52
crss-reg/crss-reg-devoracle.yml

@@ -1,52 +0,0 @@
-spring:
-  datasource:
-    platform: oracle
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-    username: crss_reg
-    password: crss_reg
-    driverClassName: oracle.jdbc.OracleDriver
-    hikari:
-      connectionTimeout: 10000
-      maximumPoolSize: 20
-  jpa:
-    show-sql: false
-  rabbitmq:
-    username: guest
-    password: guest
-    host: localhost
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-  mail:
-    host: smtp.gmail.com
-    port: 587
-    username: demo.exist.pemc@gmail.com
-    # please provide the password
-    password: $pockTest
-    properties:
-      mail.smtp.auth: true
-      mail.debug: true
-      mail.smtp.starttlls.enable: true
-      mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-
-server:
-  port: 8081
-
-security:
-  oauth2:
-    client:
-      accessTokenUri: http://localhost:8082/oauth/access_token
-      userAuthorizationUri: http://localhost:8082/oauth/authorize
-    resource:
-      userInfoUri: http://localhost:8082/user
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-
-graylog:
-  host: localhost

+ 0 - 13
crss-reg/crss-reg-prod.yml

@@ -1,13 +0,0 @@
-spring:
-  profiles: prod
-  datasource:
-    platform: oracle
-    url: jdbc:oracle:thin:@//[HOST][:PORT]/SERVICE
-    username: foo
-    password: bar
-    driverClassName: oracle.jdbc.OracleDriver
-  jpa:
-    database: ORACLE
-
-graylog:
-  host: TODO

+ 6 - 27
crss-reg/crss-reg-staging.yml

@@ -1,36 +1,15 @@
 spring:
+  jpa:
+    database: ORACLE
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
   datasource:
     platform: oracle
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
+    url: jdbc:oracle:thin:@192.168.241.62:1521:ORCL
     username: crss_reg
     password: crss_reg
     driverClassName: oracle.jdbc.OracleDriver
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
-  http:
-    multipart:
-      maxFileSize: "25Mb"
-      maxRequestSize: "25Mb"
-  mail:
-      host: smtp.gmail.com
-      port: 587
-      # TODO: replace this values
-      username: demo.exist.pemc@gmail.com
-      password: $pockTest
-      properties:
-        mail.smtp.auth: true
-        mail.debug: true
-        mail.smtp.starttlls.enable: true
-        mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-  rabbitmq:
-    host: pemc-oracle.ss.exist.com
-    ports:
-      - "5672:5672"
-      - "15672:15672"
-graylog:
-  host: pemc.integration.exist.com

+ 7 - 26
crss-reg/crss-reg-uat.yml

@@ -1,34 +1,15 @@
 spring:
+  jpa:
+    database: ORACLE
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.Oracle10gDialect
   datasource:
     platform: oracle
     url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
-    username: crss_reg_uat
-    password: crss_reg_uat
+    username: crss_reg
+    password: crss_reg
     driverClassName: oracle.jdbc.OracleDriver
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
-  jpa:
-    database: ORACLE
-  http:
-    multipart:
-      maxFileSize: "25Mb"
-      maxRequestSize: "25Mb"
-  mail:
-      host: smtp.gmail.com
-      port: 587
-      # TODO: replace this values
-      username: demo.exist.pemc@gmail.com
-      password: $pockTest
-      properties:
-        mail.smtp.auth: true
-        mail.debug: true
-        mail.smtp.starttlls.enable: true
-        mail.smtp.starttls.required: true
-  #we dont need spring mvc here
-  freemarker:
-    enabled: false
-    template-loader-path: classpath:/mail/templates
-
-graylog:
-  host: pemc.integration.exist.com

+ 1 - 20
crss-reg/crss-reg.yml

@@ -18,31 +18,12 @@ app:
   docmgt:
     root-folder: /crss/docmgt
 
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://discovery:8080/eureka/
-#    healthcheck:
-#      enabled: true
-
 feign:
   hystrix:
     enabled: false
-logging:
-  level:
-    com.netflix: INFO
-    org.springframework.cloud: INFO
-    org.springframework.security: INFO
 
 server:
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
+  # TODO: investigate this part and move to global config
   jackson:
    # for further customization please consult the documentation:
    # http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference/htmlsingle/#howto-customize-the-jackson-objectmapper