remove subdomains from shib access traefik labels, emg client accesses same...

remove subdomains from shib access traefik labels, emg client accesses same hostname instead of hardcoded pass

config/emg_index-ops.html

@@ -20,26 +20,12 @@
   <script>
   var today = new Date();
   today.setUTCHours(24, 0, 0, 0);
-  var baseUrl = '//emg.pass.copernicus.eu/';
+  var baseUrl = '//' + window.location.hostname + '/';
   var baseUrlsWMTS = [
-    '//a.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//b.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//c.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//d.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//e.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//f.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//g.emg.pass.copernicus.eu/cache/ows/wmts',
-    '//h.emg.pass.copernicus.eu/cache/ows/wmts',
+    baseUrl + 'cache/ows/wmts',
   ];
   var baseUrlsOws = [
-    '//a.emg.pass.copernicus.eu/ows',
-    '//b.emg.pass.copernicus.eu/ows',
-    '//c.emg.pass.copernicus.eu/ows',
-    '//d.emg.pass.copernicus.eu/ows',
-    '//e.emg.pass.copernicus.eu/ows',
-    '//f.emg.pass.copernicus.eu/ows',
-    '//g.emg.pass.copernicus.eu/ows',
-    '//h.emg.pass.copernicus.eu/ows',
+    baseUrl + 'ows',
   ];
   var config = {
     "settings": {

docker-compose.emg.ops.yml

@@ -15,13 +15,13 @@ services:
     deploy:
       labels:
         # router for shib auth based access (https)
-        - "traefik.http.routers.emg-renderer-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.emg-renderer-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
         - "traefik.http.routers.emg-renderer-shib.middlewares=shibAuth@file,compress@file,cors@file"
         - "traefik.http.routers.emg-renderer-shib.tls=true"
         - "traefik.http.routers.emg-renderer-shib.tls.certresolver=default"
         - "traefik.http.routers.emg-renderer-shib.entrypoints=https"
         # router for shib auth based access (http)
-        - "traefik.http.routers.emg-renderer-redirect-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.emg-renderer-redirect-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
         - "traefik.http.routers.emg-renderer-redirect-shib.middlewares=redirect@file"
         - "traefik.http.routers.emg-renderer-redirect-shib.entrypoints=http"
         # router for referrer based access (https)
@@ -68,14 +68,14 @@ services:
       labels:
         - "traefik.http.middlewares.cache-stripprefix.stripprefix.prefixes=/cache"
         # router for shib auth based access (https)
-        - "traefik.http.routers.emg-cache-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.emg-cache-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
         - "traefik.http.routers.emg-cache-shib.middlewares=emg-cache-shib-chain"
         - "traefik.http.middlewares.emg-cache-shib-chain.chain.middlewares=shibAuth@file,cache-stripprefix,compress@file,cors@file"
         - "traefik.http.routers.emg-cache-shib.tls=true"
         - "traefik.http.routers.emg-cache-shib.tls.certresolver=default"
         - "traefik.http.routers.emg-cache-shib.entrypoints=https"
         # router for shib auth based access (http)
-        - "traefik.http.routers.emg-cache-redirect-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.emg-cache-redirect-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
         - "traefik.http.routers.emg-cache-redirect-shib.middlewares=redirect@file"
         - "traefik.http.routers.emg-cache-redirect-shib.entrypoints=http"
         # router for referrer based access (https)
@@ -200,13 +200,13 @@ services:
         constraints: [node.role == manager]
       labels:
         # router for basic auth based access (https)
-        - "traefik.http.routers.emg-shibauth.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
+        - "traefik.http.routers.emg-shibauth.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
         - "traefik.http.routers.emg-shibauth.middlewares=compress@file,cors@file"
         - "traefik.http.routers.emg-shibauth.tls=true"
         - "traefik.http.routers.emg-shibauth.tls.certresolver=default"
         - "traefik.http.routers.emg-shibauth.entrypoints=https"
         # router for basic auth based access (http)
-        - "traefik.http.routers.emg-shibauth-redirect.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
+        - "traefik.http.routers.emg-shibauth-redirect.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
         - "traefik.http.routers.emg-shibauth-redirect.middlewares=redirect@file"
         - "traefik.http.routers.emg-shibauth-redirect.entrypoints=http"
         # general

docker-compose.emg.staging.yml

@@ -14,13 +14,13 @@ services:
     deploy:
       labels:
         # router for shib auth based access (https)
-        - "traefik.http.routers.emg-renderer-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.emg-renderer-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
         - "traefik.http.routers.emg-renderer-shib.middlewares=shibAuth@file,compress@file,cors@file"
         - "traefik.http.routers.emg-renderer-shib.tls=true"
         - "traefik.http.routers.emg-renderer-shib.tls.certresolver=default"
         - "traefik.http.routers.emg-renderer-shib.entrypoints=https"
         # router for shib auth based access (http)
-        - "traefik.http.routers.emg-renderer-redirect-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
+        - "traefik.http.routers.emg-renderer-redirect-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/ows`, `/opensearch`, `/admin`)"
         - "traefik.http.routers.emg-renderer-redirect-shib.middlewares=redirect@file"
         - "traefik.http.routers.emg-renderer-redirect-shib.entrypoints=http"
         # router for basic auth based access (https)
@@ -54,14 +54,14 @@ services:
       labels:
         - "traefik.http.middlewares.cache-stripprefix.stripprefix.prefixes=/cache"
         # router for shib auth based access (https)
-        - "traefik.http.routers.emg-cache-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.emg-cache-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
         - "traefik.http.routers.emg-cache-shib.middlewares=emg-cache-shib-chain"
         - "traefik.http.middlewares.emg-cache-shib-chain.chain.middlewares=shibAuth@file,cache-stripprefix,compress@file,cors@file"
         - "traefik.http.routers.emg-cache-shib.tls=true"
         - "traefik.http.routers.emg-cache-shib.tls.certresolver=default"
         - "traefik.http.routers.emg-cache-shib.entrypoints=https"
         # router for shib auth based access (http)
-        - "traefik.http.routers.emg-cache-redirect-shib.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
+        - "traefik.http.routers.emg-cache-redirect-shib.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/cache`)"
         - "traefik.http.routers.emg-cache-redirect-shib.middlewares=redirect@file"
         - "traefik.http.routers.emg-cache-redirect-shib.entrypoints=http"
         # router for basic auth based access (https)
@@ -159,13 +159,13 @@ services:
       replicas: 1
       labels:
         # router for basic auth based access (https)
-        - "traefik.http.routers.emg-shibauth.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
+        - "traefik.http.routers.emg-shibauth.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
         - "traefik.http.routers.emg-shibauth.middlewares=compress@file,cors@file"
         - "traefik.http.routers.emg-shibauth.tls=true"
         - "traefik.http.routers.emg-shibauth.tls.certresolver=default"
         - "traefik.http.routers.emg-shibauth.entrypoints=https"
         # router for basic auth based access (http)
-        - "traefik.http.routers.emg-shibauth-redirect.rule=Host(`emg.pass.copernicus.eu`, `a.emg.pass.copernicus.eu`, `b.emg.pass.copernicus.eu`, `c.emg.pass.copernicus.eu`, `d.emg.pass.copernicus.eu`, `e.emg.pass.copernicus.eu`, `f.emg.pass.copernicus.eu`, `g.emg.pass.copernicus.eu`, `h.emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
+        - "traefik.http.routers.emg-shibauth-redirect.rule=Host(`emg.pass.copernicus.eu`) && PathPrefix(`/Shibboleth.sso`)"
         - "traefik.http.routers.emg-shibauth-redirect.middlewares=redirect@file"
         - "traefik.http.routers.emg-shibauth-redirect.entrypoints=http"
         # general