Commit a7fa3295 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Renombra elementos conflictivos para duplicar

parent ea7e847f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ stages: 
  variables:

    STACK: gis

  environment:

    url: https://${GEOSERVER_ADMIN_SUBDOMAIN}.${PUBLIC_HOSTNAME}
 
    url: https://${2_GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

deploy/.env

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ POSTGRES_INITDB_WALDIR=/var/lib/postgresql/wal 
VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

GEOSERVER_DATA_VOL_NAME=geoserver-data-vol

GEOSERVER_DATA_VOL_NAME=2-geoserver-data-vol

CACHE_VOL_NAME=geoserver-cache-vol

FONTS_VOL_NAME=geoserver-fonts-vol

FOOTPRINTS_VOL_NAME=geoserver-footprints-vol

deploy/config/node-cluster.properties

+1 −1
Original line number Diff line number Diff line 
readOnly=enabled

durable=false

brokerURL=failover:(tcp://geoserver-master:61616)

brokerURL=failover:(tcp://2-geoserver-master:61616)

embeddedBroker=disabled

connection.retry=10

toggleMaster=false

deploy/docker-compose.dev.yml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ volumes: 
    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: :/geoserver-data-vol/

      device: :/2-geoserver-data-vol/



  cache-vol:

    name: ${CACHE_VOL_NAME}

deploy/docker-compose.tmpl.yml

+7 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ x-geoserver-deploy: &geoserver-deploy 
    delay: ${GEOSERVER_UPDATE_DELAY:-3m}



services:

  geoserver-master:

  2-geoserver-master:

    << : *geoserver-root

    environment:

      << : *geoserver-environment
@@ -84,10 +84,10 @@ services: 
        traefik.web.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/web'

        traefik.login.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};PathPrefix:/geoserver/j_spring_security'

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

        traefik.backend: geoserver-master

        traefik.backend: 2-geoserver-master

        traefik.port: '${GEOSERVER_PORT}'



  geoserver-node:

  2-geoserver-node:

    << : *geoserver-root

    environment:

      << : *geoserver-environment
@@ -95,7 +95,7 @@ services: 
      TOGGLE_SLAVE: 'true'

      WEB_INTERFACE: 'true'

      EMBEDDED_BROKER: disabled

      BROKER_URL: 'tcp://geoserver-master:${BROKER_PORT}'

      BROKER_URL: 'tcp://2-geoserver-master:${BROKER_PORT}'

      READONLY: enabled

    volumes: *geoserver-volumes

    networks: *geoserver-networks
@@ -113,7 +113,7 @@ services: 
      labels:

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

        traefik.root.frontend.rule: 'Host:${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME};Path:/;AddPrefix:/geoserver'

        traefik.backend: geoserver-node

        traefik.backend: 2-geoserver-node

        traefik.port: '${GEOSERVER_PORT}'



  postgres-gwc:
@@ -173,9 +173,9 @@ configs: 
    file: ./config/web.xml



  master-cluster-properties-config:

    name: ${MASTER_CLUSTER_PROPERTIES_CONFIG_NAME:-geoserver-master-cluster-properties-config}

    name: ${MASTER_CLUSTER_PROPERTIES_CONFIG_NAME:-2-geoserver-master-cluster-properties-config}

    file: ./config/master-cluster.properties



  node-cluster-properties-config:

    name: ${NODE_CLUSTER_PROPERTIES_CONFIG_NAME:-geoserver-node-cluster-properties-config}

    name: ${NODE_CLUSTER_PROPERTIES_CONFIG_NAME:-2-geoserver-node-cluster-properties-config}

    file: ./config/node-cluster.properties