Commit 5833c87f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Unifica config de cluster de nuevo, refactoriza

See merge request redmic-project/gis/geoserver!66
parents e9136cca 17bddd02

.gitlab-ci.yml

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ variables: 
.deploy:

  variables:

    STACK: ${PROJECT_PARENT_NAME}

  environment:

    url: https://${DD_GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}

    STATUS_CHECK_DELAY: 300



.deploy-external-service:

  variables:

deploy/.env

+16 −3
Original line number Diff line number Diff line
@@ -12,12 +12,16 @@ STABLE_EXTENSIONS=css-plugin,inspire-plugin,csw-plugin,netcdf-plugin,netcdf-out- 
COMMUNITY_EXTENSIONS=jms-cluster-plugin

CLUSTERING=true

CLUSTER_DURABILITY=false

CLUSTER_CONNECTION_RETRY_COUNT=10

CLUSTER_CONNECTION_MAX_WAIT=500

TOMCAT_EXTRAS=false

ROOT_WEBAPP_REDIRECT=true

GEOSERVER_LABEL_COLOR=white

GEOSERVER_LABEL_BACKGROUND=black

GEOSERVER_SUBDOMAIN=atlas

DISK_QUOTA_SIZE=5

GEOSERVER_LOG_LEVEL=PRODUCTION_LOGGING

DISABLE_CORS=true



DEV_MASTER_INITIAL_MEMORY=1G

DEV_MASTER_MAXIMUM_MEMORY=1G
@@ -43,12 +47,21 @@ POSTGRES_DB=gwc 
PGDATA=/var/lib/postgresql/data

POSTGRES_INITDB_WALDIR=/var/lib/postgresql/wal



VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

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

DEV_VOL_DRIVER=seaweedfs



GEOSERVER_DATA_VOL_NAME=geoserver-data-vol

CACHE_VOL_NAME=geoserver-cache-vol

FONTS_VOL_NAME=geoserver-fonts-vol

FOOTPRINTS_VOL_NAME=geoserver-footprints-vol

POSTGRES_DATA_VOL_NAME=postgres-gwc-data-vol

WAL_VOL_NAME=postgres-gwc-wal-vol



PUBLIC_HOSTNAME=change.me

GEOSERVER_HEALTH_PATH=/geoserver/rest/about/version.xml

TRAEFIK_ENABLE=true

TRAEFIK_ENTRYPOINT=http

TRAEFIK_HEALTH_AUTH=Basic YWRtaW46Y2hhbmdlbWU=

TRAEFIK_COOKIE_NAME=traefik-geoserver

TRAEFIK_COOKIE_HTTPONLY=true

TRAEFIK_COOKIE_SECURE=true

TRAEFIK_COOKIE_SAMESITE=lax

deploy/config/cluster.properties

+2 −2
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ readOnly=${READONLY} 
durable=${CLUSTER_DURABILITY}

brokerURL=failover:(${BROKER_URL})

embeddedBroker=${EMBEDDED_BROKER}

connection.retry=10

connection.retry=${CLUSTER_CONNECTION_RETRY_COUNT}

toggleMaster=${TOGGLE_MASTER}

xbeanURL=./broker.xml

embeddedBrokerProperties=embedded-broker.properties

topicName=VirtualTopic.geoserver

connection=enabled

toggleSlave=${TOGGLE_SLAVE}

connection.maxwait=500

connection.maxwait=${CLUSTER_CONNECTION_MAX_WAIT}

group=geoserver-cluster

deploy/config/master-cluster.properties

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
readOnly=disabled

durable=false

brokerURL=failover:(tcp://0.0.0.0:61616)

embeddedBroker=enabled

connection.retry=10

toggleMaster=true

xbeanURL=./broker.xml

embeddedBrokerProperties=embedded-broker.properties

topicName=VirtualTopic.geoserver

connection=enabled

toggleSlave=false

connection.maxwait=500

group=geoserver-cluster

deploy/config/node-cluster.properties

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
readOnly=enabled

durable=false

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

embeddedBroker=disabled

connection.retry=10

toggleMaster=false

xbeanURL=./broker.xml

embeddedBrokerProperties=embedded-broker.properties

topicName=VirtualTopic.geoserver

connection=enabled

toggleSlave=true

connection.maxwait=500

group=geoserver-cluster