moved radicale to c.aggtaa.com/server2 and davical to c.aggtaa.com/server

This commit is contained in:
azykov@mail.ru
2026-08-09 20:48:17 +03:00
parent dc00fd2467
commit 6b966107d1
13 changed files with 87 additions and 73 deletions
@@ -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:
@@ -3,5 +3,6 @@ kind: Kustomization
resources:
- helmrepository.yaml
- secret.enc.yaml
- middleware.yaml
- helmrelease-postgres.yaml
- helmrelease-davical.yaml
@@ -0,0 +1,9 @@
apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
name: davical-stripprefix
namespace: pim
spec:
stripPrefix:
prefixes:
- /server
+10 -10
View File
@@ -4,21 +4,21 @@ metadata:
name: davical-secrets
namespace: pim
stringData:
PGSQL_ROOT_PASS: ENC[AES256_GCM,data:F9vmsL1RhEBLZlTm7cYmehgIeL36t3PfiEaGPpD/UGwKOAcXPzDSuOYYL4fE4Fa5,iv:V55cLsEUi6bYW8p+e9qn2dRyo78HN11fjk2/ifQ+nBI=,tag:8EMBxC98sn/MiVEKn+fYgw==,type:str]
PASSDAVDB: ENC[AES256_GCM,data:Q9fxa0/mANahCC2l9KrUKZJcslNtUFIiZSsigzQvvfNlTTThIpoprM55zNtgSjJy,iv:pFtqdvo8+BBjip59py+sOatb4pOjNCgspxlf6pywG30=,tag:ERt2S7DTrFTsIbt9dRWmwg==,type:str]
ADMINDAVICALPASS: ENC[AES256_GCM,data:/R/aQ7O0FK2xmjom3rN1t57cdXPhzhwhoeXH+uO/RkU=,iv:et7ixzBm5srmi5Y1Qfg5iOu109GIAJMrlVFiL2fbP8E=,tag:M7Kjcy7l/2T/BiYnxI9avA==,type:str]
PGSQL_ROOT_PASS: ENC[AES256_GCM,data:kov7rlxHbjXaoayqP3UhjGPPyagsxA+DutQbuNzMqo41PTa+1AA8cQoZZ5QbkLMp,iv:4hjs8aBgm11Iq9K+wxXDcTG1Ee72I7m8i0s7rGfl9sM=,tag:zuOnX/6y9YAAkk4WkF6HJA==,type:str]
PASSDAVDB: ENC[AES256_GCM,data:UGHf34tRRAVr5A+dHSxYkdDr6vFunjreFIjQsnTV0eiF4cXT96RKZDnWX/tAYzzC,iv:uZLRYgOEgfNbbMBIQI3uVEOr0VtgCCQlwVJxBhNCZPM=,tag:2azyVW6oj5Tz5riN4LEmUA==,type:str]
ADMINDAVICALPASS: ENC[AES256_GCM,data:nHWF4fD207skRQsF6ZHloPlXUc6nOBNNSG4By6K84aE=,iv:Pbt4nx1MWmgFh6EltrU3qleng2HZpEynTxc26CGgPMI=,tag:8RK/nzUJJH/lhBeYpWWleQ==,type:str]
sops:
age:
- recipient: age1yx8mey02c0mu6te9hwxwdqp5n4enjz35e8thchsmvhqw7xsrzy0syg367g
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqbm94ZjFiVGdVM0RJV0Rt
TnZuM09VbXZGbHRWUUlJVjdETmR3L3FnbkZzCkFLMmsrWm9zZk5UbHprS0JHV216
Q1hjRUdERGFLTTNVeUZTQmNJL2VFMHcKLS0tIGpDc3pZTkE0dFdHYkxlKy83R2pB
S1lDZFZScitOWjVheVF2TzNWQzZKRTgKT2eq78o94ZZEqJh8NlZ/vmq+T5XfSIRZ
2AAQ0uFlummfxOPkYt3AhOvStyjFOfzJ6nKTad1zYym1JBKqYCBRJQ==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuMGt3OFhScWI4K2FMeTZS
djc2ZXN6emw3dnViQXNpLy9obTBzeStDZzBnClBjcFJjU2hEc2xiRGhMeW5RWFFz
TnNvUEhsZm5mWXBVVFI3L2E3S2htUkkKLS0tIHRNQjhIeGZtWlBkWUt6WTFELzQ5
TURuSDBJdEZRNFFrWXo3YzdObE9tdU0KFXr6yBqTsrtnWeae+yONQAphX14HmAt8
ptypIfbaxaLjtvNw0Dg7p+vPbDkCeLcLKAaIgo/xVnZFAaxJqzCXog==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2026-08-26T10:23:48Z"
mac: ENC[AES256_GCM,data:RUp7nDlmoNBgQ5txyshNiXSiP8uobdzmPEnlb0dz1p/ERaIdYkZ//1vGjUu1+zzCjLhzA/qMNPep7OygP81anpHcWEszpHUUhLJpn86gVqmtrzTCkzhD4j2LtCpff7vr9gygXgPWjeE2Is30Z4T+jY820k97OJuha3ZPDfiPHH0=,iv:xrM6SxvByUmFILWP1pw2ZAPVT4bTwx9MEXUsa2yxHPo=,tag:9M/EneO6nFTeCd6exA5dyQ==,type:str]
lastmodified: "2026-08-26T10:23:55Z"
mac: ENC[AES256_GCM,data:vzYxxZE6kkuskQrjC0dHFbTk9fW9S28Vk77qYz9depHmNyTj0jxIhdncGEiI6ymuKIOPdUAnkWnehMB1nnpowVQ5gC7kbxcuhTlhJQy4pEDWEcOq3967+JIKW1yj1/pZSw/+EP7GkL/3WLwhZy6NEajBovOfOxOyYSWiJFlCkrI=,iv:1lUPYy6lMNFVgSS94WRlJAeu7tS/LZjcixfhxYgJD1E=,tag:vcffA2DsUPppBuZGrwNuIg==,type:str]
encrypted_regex: ^(data|stringData)$
version: 3.11.0