Commit 695b4c57 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Reubica recursos en lugar original, corrige labels

See merge request redmic-project/static-pages!10
parents 5ff75b17 9be94685

content/50x/index.html

+2 −2
Original line number Diff line number Diff line 
<html>

	<head>

		<link rel="stylesheet" type="text/css" href="style.css" >

		<link rel="stylesheet" type="text/css" href="resources/style.css" >

	</head>

	<body>

		<div class="outerApp">

			<div class="accessGroup bgWhite">

				<div class="header">

					<div class="title">

						<img class="logoRedmic" src="logo.svg">

						<img class="logoRedmic" src="resources/logo.svg">

						<h1 class="titleRedmic">REDMIC</h1>

					</div>

					<h4 class="subtitle">Repositorio de Datos Marinos Integrados de Canarias</h4>

content/50x/logo.svg→content/50x/resources/logo.svg

+0 −0

File moved.

View file

content/50x/style.css→content/50x/resources/style.css

+0 −0

File moved.

View file

docker-compose.prod.yml

+4 −4
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ services: 
        traefik.static.port: "${INTERNAL_PORT}"

        traefik.static.frontend.rule: Host:${STATIC_SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.static.backend: static-pages

        traefik.error-handle.port: "${INTERNAL_PORT}"

        traefik.error-handle.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefixStripRegex:/{.*};AddPrefix:/50x/

        traefik.error-handle.frontend.priority: "1"

        traefik.error-handle.backend: static-pages

        traefik.web-error-handle.port: "${INTERNAL_PORT}"

        traefik.web-error-handle.frontend.rule: Host:${PUBLIC_HOSTNAME};ReplacePathRegex:^.*?(resources/[^/]+\\.\\w+)?$$ /50x/$$1

        traefik.web-error-handle.frontend.priority: "1"

        traefik.web-error-handle.backend: static-pages

      restart_policy:

        condition: on-failure

        delay: 30s