Commit 614aab01 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/tasks!15
parents e37951c2 ca1386b1

deploy/docker-compose.prod.yml

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ services: 
    environment:

      SPRING_PROFILES_ACTIVE: prod

    deploy:

      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

src/main/resources/application-dev.properties

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ elastic.clusterName=es_dev 
redmic.elasticsearch.check.mappings=false

redmic.elasticsearch.create.mappings=false



logging.level.es.redmic=debug

logging.level.root=warn



#Kafka config

spring.kafka.bootstrap-servers=localhost:19092

src/main/resources/application-pre.properties

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ elastic.clusterName=es_dev 
redmic.elasticsearch.check.mappings=true

redmic.elasticsearch.create.mappings=false



logging.level.es.redmic=warn

logging.level.root=warn



#Kafka config

spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092

src/main/resources/application-prod.properties

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ elastic.clusterName=es_pro 
redmic.elasticsearch.check.mappings=true

redmic.elasticsearch.create.mappings=false



logging.level.es.redmic=warn

logging.level.root=error



#Kafka config

spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092

src/main/resources/application-test.properties

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ elastic.clusterName=es_dev 
redmic.elasticsearch.check.mappings=false

redmic.elasticsearch.create.mappings=false



logging.level.es.redmic=debug

logging.level.root=debug



#Kafka config

spring.kafka.bootstrap-servers=${spring.embedded.kafka.brokers}