Commit 01c34922 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Recupera red de db y actualiza reglas de entrada

See merge request redmic-project/gis/geoserver!16
parents d09b97a3 fe7ff352

docker-compose.prod.yml

+8 −6
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ services: 
      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver,PathPrefix:/geoserver/web,PathPrefix:/geoserver/rest"

        traefik.frontend.priority: "100"

        traefik.backend: geoserver-master

        traefik.admin.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/web,PathPrefix:/geoserver/rest"

        traefik.admin.backend: geoserver-master

        traefik.content.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver"

        traefik.content.frontend.priority: "100"

        traefik.content.backend: geoserver

      placement:

        constraints:

          - node.role == worker
@@ -30,9 +32,9 @@ services: 
      labels:

        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/{((?!web).*)};PathPrefix:/geoserver/{((?!rest).*)}"

        traefik.frontend.priority: "99"

        traefik.backend: geoserver-slave

        traefik.frontend.rule: "Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver"

        traefik.frontend.priority: "100"

        traefik.backend: geoserver

      placement:

        constraints:

          - node.role == worker

docker-compose.tmpl.yml

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ services: 
      - JAVA_OPTS=-Xmx1g -Xss1g

    networks:

      - gis-net

      - postgres-net

    volumes:

      - geoserver-vol:/var/geoserver/data

    healthcheck:
@@ -22,6 +23,7 @@ services: 
      - JAVA_OPTS=-Xmx1g -Xss1g -DGEOSERVER_CONSOLE_DISABLED=true

    networks:

      - gis-net

      - postgres-net

    volumes:

      - geoserver-vol:/var/geoserver/data

    healthcheck:
@@ -34,3 +36,5 @@ services: 
networks:

  gis-net:

    external: true

  postgres-net:

    external: true
 
 No newline at end of file

scripts/cluster.template

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
toggleSlave=${SLAVE_ACTIVE}

topicName=${BROKER_TOPIC_NAME}

connection=enabled

brokerURL=${BROKER_URL}

durable=true

xbeanURL=./broker.xml

toggleMaster=${MASTER_ACTIVE}

embeddedBroker=disabled

CLUSTER_CONFIG_DIR=${CLUSTER_CONFIG_DIR}

embeddedBrokerProperties=embedded-broker.properties

connection.retry=10

readOnly=disabled

group=${BROKER_GROUP}

connection.maxwait=500
 
 No newline at end of file