Commit 221a850a authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Configura cluster y corrige login mediante configs

parent 187c565f

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ BROKER_PORT=61616 
GEOSERVER_DATA_DIR=/opt/geoserver/data_dir

GEOWEBCACHE_CACHE_DIR=/opt/geoserver/gwc

FOOTPRINTS_DATA_DIR=/opt/footprints_dir

EXTRA_CONFIG_DIR=/settings

GEOSERVER_ADMIN_USER=admin

GEOSERVER_ADMIN_PASSWORD=changeme

STABLE_EXTENSIONS=css-plugin,inspire-plugin,csw-plugin,netcdf-plugin,netcdf-out-plugin,ysld-plugin

deploy/config/cluster.properties

0 → 100644
+15 −0
Original line number Diff line number Diff line 
CLUSTER_CONFIG_DIR=${CLUSTER_CONFIG_DIR}

instanceName=${INSTANCE_STRING}

readOnly=${READONLY}

durable=${CLUSTER_DURABILITY}

brokerURL=failover:(${BROKER_URL})?initialReconnectDelay=1000&useExponentialBackOff=false

embeddedBroker=${EMBEDDED_BROKER}

connection.retry=10

toggleMaster=${TOGGLE_MASTER}

xbeanURL=./broker.xml

embeddedBrokerProperties=embedded-broker.properties

topicName=VirtualTopic.geoserver

connection=enabled

toggleSlave=${TOGGLE_SLAVE}

connection.maxwait=500

group=geoserver-cluster

deploy/config/embedded-broker.properties

0 → 100644
+9 −0
Original line number Diff line number Diff line 
activemq.jmx.useJmx=false

activemq.jmx.port=1098

activemq.jmx.host=localhost

activemq.jmx.createConnector=false

activemq.transportConnectors.server.uri=${BROKER_URL}?maximumConnections=1000&wireFormat.maxFrameSize=104857600&jms.useAsyncSend=true&transport.daemon=true&trace=true

activemq.broker.persistent=true

activemq.broker.systemUsage.memoryUsage=128 mb

activemq.broker.systemUsage.storeUsage=1 gb

activemq.broker.systemUsage.tempUsage=128 mb

deploy/config/web.xml

0 → 100644
+4156 −0

File added.

Preview size limit exceeded, changes collapsed.

deploy/docker-compose.tmpl.yml

+25 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ x-geoserver-environment: &geoserver-environment 
  GEOSERVER_DATA_DIR:

  GEOWEBCACHE_CACHE_DIR:

  FOOTPRINTS_DATA_DIR:

  EXTRA_CONFIG_DIR:

  HTTP_PORT: '${GEOSERVER_PORT}'

  HTTP_PROXY_NAME: '${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}'

  STABLE_EXTENSIONS:
@@ -17,6 +18,7 @@ x-geoserver-environment: &geoserver-environment 
  CLUSTER_DURABILITY:

  TOMCAT_EXTRAS:

  GEOSERVER_NODE_OPTS: 'id:{{.Service.Name}}-{{.Task.Slot}};background:${GEOSERVER_LABEL_BACKGROUND};color:${GEOSERVER_LABEL_COLOR}'

  CATALINA_OPTS: '-DHTTP_PROXY_NAME=$${HTTP_PROXY_NAME}'

  DB_BACKEND: 'postgres'

  HOST: 'postgres-gwc'

  POSTGRES_PORT: '5432'
@@ -36,6 +38,14 @@ x-geoserver-networks: &geoserver-networks 
  postgres-net:

  traefik-net:



x-geoserver-configs: &geoserver-configs

  - source: web-xml-config

    target: ${EXTRA_CONFIG_DIR}/web.xml

  - source: broker-properties-config

    target: ${EXTRA_CONFIG_DIR}/embedded-broker.properties

  - source: cluster-properties-config

    target: ${EXTRA_CONFIG_DIR}/cluster.properties



x-geoserver-healthcheck: &geoserver-healthcheck

  test: curl --fail --silent http://localhost:${GEOSERVER_PORT}/geoserver

  interval: ${GEOSERVER_HEALTHCHECK_INTERVAL:-1m}
@@ -65,6 +75,7 @@ services: 
      READONLY: disabled

    volumes: *geoserver-volumes

    networks: *geoserver-networks

    configs: *geoserver-configs

    healthcheck: *geoserver-healthcheck

    deploy:

      << : *geoserver-deploy
@@ -90,6 +101,7 @@ services: 
      READONLY: enabled

    volumes: *geoserver-volumes

    networks: *geoserver-networks

    configs: *geoserver-configs

    healthcheck: *geoserver-healthcheck

    deploy:

      << : *geoserver-deploy
@@ -152,3 +164,16 @@ networks: 
    name: ${TRAEFIK_NET_NAME:-traefik-net}

    driver: ${TRAEFIK_NET_DRIVER:-overlay}

    external: true



configs:

  web-xml-config:

    name: ${WEB_XML_CONFIG_NAME:-geoserver-web-xml-config}

    file: ./config/web.xml



  broker-properties-config:

    name: ${BROKER_PROPERTIES_CONFIG_NAME:-geoserver-broker-properties-config}

    file: ./config/embedded-broker.properties



  cluster-properties-config:

    name: ${CLUSTER_PROPERTIES_CONFIG_NAME:-geoserver-cluster-properties-config}

    file: ./config/cluster.properties