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

Merge branch 'dev' into 'master' 

Permite restringir acceso desde ciertos dominios

See merge request redmic-project/gis/geoserver!75
parents 1d8048fa 6880b143

deploy/.env

+11 −9
Original line number Diff line number Diff line
@@ -40,25 +40,27 @@ POSTGRES_USER=geowebcache 
POSTGRES_PASS=changeme

POSTGRES_DB=gwc



DEV_INITIAL_MEMORY=300M

DEV_MAXIMUM_MEMORY=1G

RESTRICTED_REFERERS=example.com|example.org



DEV_INITIAL_MEMORY=512M

DEV_MAXIMUM_MEMORY=1200M

DEV_RESOURCES_RESERVATIONS_MEMORY=1500M

DEV_RESOURCES_LIMITS_MEMORY=2500M

DEV_RESOURCES_LIMITS_MEMORY=2G

DEV_RESOURCES_LIMITS_CPUS=1

DEV_RESOURCES_RESERVATIONS_CPUS=0.1



PRO_INITIAL_MEMORY=512M

PRO_MAXIMUM_MEMORY=1500M

PRO_RESOURCES_RESERVATIONS_MEMORY=2500M

PRO_INITIAL_MEMORY=1500M

PRO_MAXIMUM_MEMORY=2700M

PRO_RESOURCES_RESERVATIONS_MEMORY=3G

PRO_RESOURCES_LIMITS_MEMORY=4G

PRO_RESOURCES_LIMITS_CPUS=2

PRO_RESOURCES_RESERVATIONS_CPUS=0.1

PRO_RESOURCES_LIMITS_CPUS=3

PRO_RESOURCES_RESERVATIONS_CPUS=0.5



DEV_VOL_DRIVER=local

VOL_TYPE=nfs

VOL_ADDR=127.0.0.1

VOL_VERS=4.2

VOL_OPTS=nolock,noacl,noatime,nodiratime

VOL_OPTS=soft,nolock,noacl,noatime,nodiratime



PRO_VOL_DRIVER=cloudstor:aws

deploy/compose.tmpl.yaml

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ x-geoserver-traefik-common-service-labels: &geoserver-traefik-common-service-lab 
  traefik.http.services.geoserver.loadbalancer.healthcheck.path: ${GEOSERVER_HEALTH_PATH}

  traefik.http.services.geoserver.loadbalancer.healthcheck.headers.authorization: ${TRAEFIK_HEALTH_AUTH}



  traefik.http.routers.geoserver-noop.entrypoints: ${TRAEFIK_ENTRYPOINT}

  traefik.http.routers.geoserver-noop.rule: >-

    Host(`${GEOSERVER_SUBDOMAIN}.${PUBLIC_HOSTNAME}`) && HeadersRegexp(`referer`, `.+${RESTRICTED_REFERERS}.*`)

  traefik.http.routers.geoserver-noop.service: noop@internal



services:

  geoserver-master:

    << : *geoserver-root