From e558d513682d3bd40ae303bacd819e25f23d0fc5 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Tue, 29 Sep 2020 17:36:25 +0200
Subject: [PATCH] rename test routers, fix syntax compose
---
docker-compose.test.ops.yml | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/docker-compose.test.ops.yml b/docker-compose.test.ops.yml
index 69f4143b..df6bd812 100644
--- a/docker-compose.test.ops.yml
+++ b/docker-compose.test.ops.yml
@@ -2,24 +2,21 @@ version: "3.6"
services:
shibauth:
image: testing-shibboleth
- deploy:
- placement:
- constraints: [node.role == manager]
deploy:
labels:
# router for basic auth based access (https)
- - "traefik.http.routers.emg-renderer.rule=Host(`shib.pdas.prism.eox.at`)"
- - "traefik.http.routers.emg-renderer.middlewares=compress@file,cors@file"
- - "traefik.http.routers.emg-renderer.tls=true"
- - "traefik.http.routers.emg-renderer.tls.certresolver=default"
- - "traefik.http.routers.emg-renderer.entrypoints=https"
+ - "traefik.http.routers.shibauth.rule=Host(`shib.pdas.prism.eox.at`)"
+ - "traefik.http.routers.shibauth.middlewares=compress@file,cors@file"
+ - "traefik.http.routers.shibauth.tls=true"
+ - "traefik.http.routers.shibauth.tls.certresolver=default"
+ - "traefik.http.routers.shibauth.entrypoints=https"
# router for basic auth based access (http)
- - "traefik.http.routers.emg-renderer-redirect.rule=Host(`shib.pdas.prism.eox.at`)"
- - "traefik.http.routers.emg-renderer-redirect.middlewares=redirect@file"
- - "traefik.http.routers.emg-renderer-redirect.entrypoints=http"
+ - "traefik.http.routers.shibauth-redirect.rule=Host(`shib.pdas.prism.eox.at`)"
+ - "traefik.http.routers.shibauth-redirect.middlewares=redirect@file"
+ - "traefik.http.routers.shibauth-redirect.entrypoints=http"
# general
- - "traefik.http.services.emg-renderer.loadbalancer.sticky=false"
- - "traefik.http.services.emg-renderer.loadbalancer.server.port=80"
+ - "traefik.http.services.shibauth.loadbalancer.sticky=false"
+ - "traefik.http.services.shibauth.loadbalancer.server.port=80"
- "traefik.docker.network=shib-extnet"
- "traefik.docker.lbswarm=true"
- "traefik.enable=true"
--
GitLab