From 5d5231d69e2abcc09fc7dc23cc58144b79ae3b5c Mon Sep 17 00:00:00 2001
From: "azykov@mail.ru" <azykov@mail.ru>
Date: Sun, 9 Aug 2026 20:48:17 +0300
Subject: [PATCH] moved radicale to c.aggtaa.com/server2 and davical to
 c.aggtaa.com/server

---
 .../base/apps/davical/helmrelease-davical.yaml   | 16 ++++++++++------
 clusters/base/apps/davical/kustomization.yaml    |  1 +
 clusters/base/apps/davical/middleware.yaml       |  9 +++++++++
 .../base/apps/radicale/helmrelease-agendav.yaml  |  2 +-
 .../base/apps/radicale/helmrelease-radicale.yaml |  2 +-
 clusters/base/apps/radicale/middleware.yaml      |  4 ++--
 6 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 clusters/base/apps/davical/middleware.yaml

diff --git a/clusters/base/apps/davical/helmrelease-davical.yaml b/clusters/base/apps/davical/helmrelease-davical.yaml
index cac784a..03664c0 100644
--- a/clusters/base/apps/davical/helmrelease-davical.yaml
+++ b/clusters/base/apps/davical/helmrelease-davical.yaml
@@ -34,7 +34,7 @@ spec:
               tag: "82-1.1.12"
             env:
               TZ: Europe/Moscow
-              HOST_NAME: c2.aggtaa.com
+              HOST_NAME: c.aggtaa.com
               DBHOST: davical-postgres
               UPDATE_FROM_OLD: "false"
               PGSQL_ROOT_PASS:
@@ -74,20 +74,24 @@ spec:
     ingress:
       app:
         className: traefik
+        # no cert-manager annotation here: radicale's own Ingress already
+        # requests/owns the Certificate for c.aggtaa.com -> radicale-tls.
+        # A second Ingress with the annotation would create a competing
+        # Certificate for the same host/secret.
         annotations:
-          cert-manager.io/cluster-issuer: letsencrypt-prod
+          traefik.ingress.kubernetes.io/router.middlewares: pim-davical-stripprefix@kubernetescrd
         hosts:
-          - host: c2.aggtaa.com
+          - host: c.aggtaa.com
             paths:
-              - path: /
+              - path: /server
                 pathType: Prefix
                 service:
                   identifier: app
                   port: http
         tls:
-          - secretName: davical-tls
+          - secretName: radicale-tls
             hosts:
-              - c2.aggtaa.com
+              - c.aggtaa.com
 
     persistence:
       config:
diff --git a/clusters/base/apps/davical/kustomization.yaml b/clusters/base/apps/davical/kustomization.yaml
index 25d792e..7c12d0f 100644
--- a/clusters/base/apps/davical/kustomization.yaml
+++ b/clusters/base/apps/davical/kustomization.yaml
@@ -3,5 +3,6 @@ kind: Kustomization
 resources:
   - helmrepository.yaml
   - secret.enc.yaml
+  - middleware.yaml
   - helmrelease-postgres.yaml
   - helmrelease-davical.yaml
diff --git a/clusters/base/apps/davical/middleware.yaml b/clusters/base/apps/davical/middleware.yaml
new file mode 100644
index 0000000..02b8276
--- /dev/null
+++ b/clusters/base/apps/davical/middleware.yaml
@@ -0,0 +1,9 @@
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+  name: davical-stripprefix
+  namespace: pim
+spec:
+  stripPrefix:
+    prefixes:
+      - /server
diff --git a/clusters/base/apps/radicale/helmrelease-agendav.yaml b/clusters/base/apps/radicale/helmrelease-agendav.yaml
index 0960a8a..dd84d8f 100644
--- a/clusters/base/apps/radicale/helmrelease-agendav.yaml
+++ b/clusters/base/apps/radicale/helmrelease-agendav.yaml
@@ -23,7 +23,7 @@ spec:
               AGENDAV_TITLE: ""
               AGENDAV_FOOTER: ""
               AGENDAV_CALDAV_SERVER: "http://radicale.pim.svc.cluster.local:5232/%u"
-              AGENDAV_CALDAV_PUBLIC_URL: "https://c.aggtaa.com/server"
+              AGENDAV_CALDAV_PUBLIC_URL: "https://c.aggtaa.com/server2"
               AGENDAV_TIMEZONE: "Europe/Moscow"
               AGENDAV_WEEKSTART: "1"
               AGENDAV_LANG: "en"
diff --git a/clusters/base/apps/radicale/helmrelease-radicale.yaml b/clusters/base/apps/radicale/helmrelease-radicale.yaml
index a048be6..744e1e8 100644
--- a/clusters/base/apps/radicale/helmrelease-radicale.yaml
+++ b/clusters/base/apps/radicale/helmrelease-radicale.yaml
@@ -40,7 +40,7 @@ spec:
         hosts:
           - host: c.aggtaa.com
             paths:
-              - path: /server
+              - path: /server2
                 pathType: Prefix
                 service:
                   identifier: app
diff --git a/clusters/base/apps/radicale/middleware.yaml b/clusters/base/apps/radicale/middleware.yaml
index b82cd09..7eede30 100644
--- a/clusters/base/apps/radicale/middleware.yaml
+++ b/clusters/base/apps/radicale/middleware.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   stripPrefix:
     prefixes:
-      - /server
+      - /server2
 ---
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
@@ -18,4 +18,4 @@ metadata:
 spec:
   headers:
     customRequestHeaders:
-      X-Script-Name: /server
+      X-Script-Name: /server2