updating current progress

docker-compose.base.ops.yml

@@ -19,7 +19,7 @@ services:
     environment:
       HTTP_PROXY: "http://172.30.252.68:3128"
       HTTPS_PROXY: "http://172.30.252.68:3128"
-      NO_PROXY: "172.0.0.0/8,192.168.0.0/16,10.0.0.0/8"
+      NO_PROXY: "172.0.0.0/8,192.168.0.0/16,10.0.0.0/8,shibauth"
     deploy:
       placement:
         constraints: [node.role == manager]
@@ -37,13 +37,13 @@ services:
         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.rule=Host(`emg.pdas.prism.eox.at`) && PathPrefix(`/secure`, `/Shibboleth.sso`)"
         - "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.rule=Host(`emg.pdas.prism.eox.at`) && PathPrefix(`/secure`, `/Shibboleth.sso`)"
         - "traefik.http.routers.shibauth-redirect.middlewares=redirect@file"
         - "traefik.http.routers.shibauth-redirect.entrypoints=http"
         # general

shibauth/etc-httpd/conf.d/shib.conf

-ServerName shib.pdas.prism.eox.at
+ServerName emg.pdas.prism.eox.at
 LoadModule mod_shib /usr/lib64/shibboleth/mod_shib_24.so
 ShibCompatValidUser Off
 UseCanonicalName On

shibauth/etc-httpd/conf.d/sp.conf

-ServerName shib.pdas.prism.eox.at
-
 <VirtualHost *:80>
-    ServerName https://shib.pdas.prism.eox.at:443
+    ServerName https://emg.pdas.prism.eox.at:443
     UseCanonicalName On
 
     DocumentRoot "/var/www/html"
@@ -9,5 +7,6 @@ ServerName shib.pdas.prism.eox.at
       AuthType shibboleth
       ShibRequestSetting requireSession 1
       require shib-session
+      RequestHeader set Referer X-Forwarded-Uri env=X-Forwarded-Uri
     </Location>
 </VirtualHost>
\ No newline at end of file

traefik-dynamic.yml

@@ -22,7 +22,7 @@ http:
           - "***REMOVED***"
     shibAuth:
       forwardAuth:
-        address: https://shibauth/secure
+        address: http://shibauth/secure
         trustForwardHeader: true
     compress:
       compress: {}