From 59c28d0cd1e25de365ba6d04015628e788839afd Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Thu, 8 Oct 2020 16:27:24 +0200
Subject: [PATCH] testing emg.pdas.prism.eox.at directly
---
docker-compose.base.ops.yml | 5 -----
docker-compose.emg.ops.yml | 12 +-----------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml
index 807af599..421d65ce 100644
--- a/docker-compose.base.ops.yml
+++ b/docker-compose.base.ops.yml
@@ -52,11 +52,6 @@ services:
- "traefik.docker.network=shib-extnet"
- "traefik.docker.lbswarm=true"
- "traefik.enable=true"
- # labels:
- # - "traefik.enable=true"
- # - "traefik.frontend.rule=Host:shib.pdas.prism.eox.at"
- # - "traefik.port=80"
- # - "traefik.frontend.passHostHeader=true"
networks:
- shib-extnet
volumes:
diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml
index 909dab1b..cd0cbafd 100644
--- a/docker-compose.emg.ops.yml
+++ b/docker-compose.emg.ops.yml
@@ -126,7 +126,7 @@ services:
labels:
# router for basic auth based access (https)
- "traefik.http.routers.emg-client.rule=Host(`emg.pdas.prism.eox.at`, `emg.pass.copernicus.eu`)"
- - "traefik.http.routers.emg-client.middlewares=auth@file,compress@file"
+ - "traefik.http.routers.emg-client.middlewares=shibAuth@file,compress@file"
- "traefik.http.routers.emg-client.tls=true"
- "traefik.http.routers.emg-client.tls.certresolver=default"
- "traefik.http.routers.emg-client.entrypoints=https"
@@ -134,16 +134,6 @@ services:
- "traefik.http.routers.emg-client-redirect.rule=Host(`emg.pdas.prism.eox.at`, `emg.pass.copernicus.eu`)"
- "traefik.http.routers.emg-client-redirect.middlewares=redirect@file"
- "traefik.http.routers.emg-client-redirect.entrypoints=http"
- # router for basic auth based access (https)
- - "traefik.http.routers.emg-client-shib.rule=Host(`emg-secure.pdas.prism.eox.at`, `emg-secure.pass.copernicus.eu`)"
- - "traefik.http.routers.emg-client-shib.middlewares=shibAuth@file,compress@file"
- - "traefik.http.routers.emg-client-shib.tls=true"
- - "traefik.http.routers.emg-client-shib.tls.certresolver=default"
- - "traefik.http.routers.emg-client-shib.entrypoints=https"
- # router for basic auth based access (http)
- - "traefik.http.routers.emg-client-shib-redirect.rule=Host(`emg-secure.pdas.prism.eox.at`, `emg-secure.pass.copernicus.eu`)"
- - "traefik.http.routers.emg-client-shib-redirect.middlewares=redirect@file"
- - "traefik.http.routers.emg-client-shib-redirect.entrypoints=http"
# general
- "traefik.http.services.emg-client.loadbalancer.sticky=false"
- "traefik.http.services.emg-client.loadbalancer.server.port=80"
--
GitLab