From 658e2e48d081f1c659ad57470d9800c8be5f3f69 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Wed, 30 Sep 2020 15:22:38 +0200
Subject: [PATCH] intnet shib network
---
docker-compose.base.ops.yml | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml
index bf6103e8..dbf099ee 100644
--- a/docker-compose.base.ops.yml
+++ b/docker-compose.base.ops.yml
@@ -28,32 +28,14 @@ services:
- emg-extnet
- dem-extnet
- logging-extnet
- - shib-extnet
shibauth:
image: testing-shibboleth
deploy:
- # labels:
- # # router for basic auth based access (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.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.shibauth.loadbalancer.sticky=false"
- # - "traefik.http.services.shibauth.loadbalancer.server.port=80"
- # - "traefik.docker.network=shib-extnet"
- # - "traefik.docker.lbswarm=true"
- # - "traefik.enable=true"
replicas: 1
placement:
constraints: [node.role == manager]
networks:
- - shib-extnet
+ - intnet
volumes:
traefik-data:
networks:
@@ -65,5 +47,4 @@ networks:
name: dem-extnet
logging-extnet:
name: logging-extnet
- shib-extnet:
- name: shib-extnet
+ intnet:
--
GitLab