Merge branch 'main' into N21-1269-roster-adaptation

hpi-schul-cloud · Sep 22, 2023 · 3d0f5cf · 3d0f5cf
2 parents f80a5c2 + 7741200
commit 3d0f5cf
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 72 deletions.
diff --git a/ansible/host_vars/prod-nbc/cfg.yml b/ansible/host_vars/prod-nbc/cfg.yml
@@ -7,8 +7,6 @@ ALERT_STATUS_URL: https://status.niedersachsen.cloud/
 NEXTCLOUD_REDIRECT_URL: https://nextcloud.niedersachsen.cloud/apps/files/?dir=/
 NEXTCLOUD_BASE_URL: https://nextcloud.niedersachsen.cloud
 
-FEATURE_ENABLE_LDAP_SYNC_DURING_MIGRATION: "false"
-
 FEATURE_CTL_TOOLS_TAB_ENABLED: "false"
 FEATURE_LTI_TOOLS_TAB_ENABLED: "true"
 FEATURE_CTL_TOOLS_ENABLED: "false"

diff --git a/ansible/roles/erwin-idm/templates/ingress.yml.j2 b/ansible/roles/erwin-idm/templates/ingress.yml.j2
@@ -34,28 +34,28 @@ spec:
     http:
       paths:
       - path: /realms/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: erwinidm-svc
             port:
               number: {{ ERWINIDM_PORT }}
       - path: /resources/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: erwinidm-svc
             port:
               number: {{ ERWINIDM_PORT }}
       - path: /js/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: erwinidm-svc
             port:
               number: {{ ERWINIDM_PORT }}
       - path: /robots.txt
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: erwinidm-svc

diff --git a/ansible/roles/hydra/templates/ingress.yml.j2 b/ansible/roles/hydra/templates/ingress.yml.j2
@@ -25,7 +25,7 @@ spec:
     http:
       paths:
       - path: /
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: hydra-svc

diff --git a/ansible/roles/libreoffice/templates/ingress.yml.j2 b/ansible/roles/libreoffice/templates/ingress.yml.j2
@@ -25,35 +25,35 @@ spec:
     http:
       paths:
       - path: /loleaflet
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: libreoffice-svc
             port:
               number: 9980
       - path: /hosting/discovery
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: libreoffice-svc
             port:
               number: 9980
       - path: /lool/(.*)/ws
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: libreoffice-svc
             port:
               number: 9980
       - path: /lool
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: libreoffice-svc
             port:
               number: 9980
       - path: /lool/adminws
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: libreoffice-svc

diff --git a/ansible/roles/oidcmock/templates/ingress.yml.j2 b/ansible/roles/oidcmock/templates/ingress.yml.j2
@@ -25,35 +25,35 @@ spec:
     http:
       paths:
       - path: /home/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: oidcmock-svc
             port:
               number: {{ OIDCMOCK_PORT }}
       - path: /Account/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: oidcmock-svc
             port:
               number: {{ OIDCMOCK_PORT }}
       - path: /connect/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: oidcmock-svc
             port:
               number: {{ OIDCMOCK_PORT }}
       - path: /lib/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: oidcmock-svc
             port:
               number: {{ OIDCMOCK_PORT }}
       - path: /css/
-        pathType: ImplementationSpecific
+        pathType: Prefix
         backend:
           service:
             name: oidcmock-svc