Commit 1a1b3de0 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Permite cross-domain en entrada por Traefik

See merge request redmic-project/gis/geoserver!43
parents 627cc9bf faee57ab

deploy/docker-compose.geoserver-slave.dev.yml

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ services: 
        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.frontend.headers.customResponseHeaders: "Access-Control-Allow-Origin: *"

        traefik.backend: geoserver-slave

      restart_policy:

        delay: 1m

deploy/docker-compose.geoserver-slave.prod.yml

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ services: 
        traefik.port: "${GEOSERVER_PORT}"

        traefik.docker.network: traefik-net

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

        traefik.frontend.headers.customResponseHeaders: "Access-Control-Allow-Origin: *"

        traefik.backend: geoserver-slave

      placement:

        constraints: