latest progress

docker-compose.base.ops.yml

@@ -28,15 +28,37 @@ services:
       - emg-extnet
       - dem-extnet
       - logging-extnet
-      - intnet
+      - shib-extnet
   shibauth:
     image: testing-shibboleth
     deploy:
       replicas: 1
       placement:
         constraints: [node.role == manager]
+      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"        
+      # labels:
+      #   - "traefik.enable=true"
+      #   - "traefik.frontend.rule=Host:shib.pdas.prism.eox.at"
+      #   - "traefik.port=80"
+      #   - "traefik.frontend.passHostHeader=true"
     networks:
-      - intnet
+      - shib-extnet
 volumes:
   traefik-data:
 networks:
@@ -48,4 +70,5 @@ networks:
     name: dem-extnet
   logging-extnet:
     name: logging-extnet
-  intnet:
+  shib-extnet:
+    name: shib-extnet

traefik-dynamic.yml

@@ -22,7 +22,7 @@ http:
           - "***REMOVED***"
     shibAuth:
       forwardAuth:
-        address: http://shibauth/secure
+        address: http://shib.pdas.prism.eox.at/secure
         trustForwardHeader: true
     compress:
       compress: {}