commit 753888faecf8b14f8d2680aefc9aa814098aa1cb
parent ce2eaad1f96a9ef0066afdab43fc0032eab5a46c
Author: MTRNord <mtrnord1@gmail.com>
Date: Mon, 19 Feb 2024 15:22:19 +0100
Fix subpath
Diffstat:
2 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/apps/base/calendar/middleware.yaml b/apps/base/calendar/middleware.yaml
@@ -8,3 +8,13 @@ spec:
headers:
customRequestHeaders:
X-Script-Name: "/dav"
+---
+apiVersion: traefik.io/v1alpha1
+kind: Middleware
+metadata:
+ name: stripprefix
+ namespace: calendar
+spec:
+ stripPrefix:
+ prefixes:
+ - /dav
diff --git a/apps/base/calendar/release.yaml b/apps/base/calendar/release.yaml
@@ -29,7 +29,7 @@ spec:
main:
annotations:
cert-manager.io/cluster-issuer: letsencrypt-http
- traefik.ingress.kubernetes.io/router.middlewares: calendar-subpath@kubernetescrd
+ traefik.ingress.kubernetes.io/router.middlewares: calendar-subpath@kubernetescrd,calendar-stripprefix@kubernetescrd
enabled: true
hosts:
- host: midnightthoughts.space
@@ -49,15 +49,15 @@ spec:
# -- Radicale configuration. See [image documentation](https://github.com/tomsquest/docker-radicale#custom-configuration) for more information.
# @default -- See values.yaml
data:
- config.cfg: ENC[AES256_GCM,data:S52gG1B01z3ON3bC6j0SM9iXZ11LXvRthC9I9x+KCAo7e2bkHquczHlZfohk4IafxZmEef7hZbZa8+HzjyCaoOFgdwHgsEMJHq6lm+dZvm6Re4rsVJp/E55fcn8pV0gSC1t2Ka2rNzhd7Gh8mdJR5D4YCCY04qoZLGudk7gDi/LTpFfoWFVRTPvX+ypjkKu9Om7+ZhF0RXcetnzaSodvvYXyEkBG74ZTZO3FfCEyl8/rculAJMcp+2gzEoBY2q/1UGMLpV20QWMrX8u6uiHmCTmMcs7i7iL2v69Md0uh9HL8lxqYTbcsSaVvUTq+GM8paKElnXMGQ4DY+MaHdFIo3JsxeHK0V/5ExC7uF0UN6lpw5gRXftQA1dEQ1Jc5wx7z6T8yHrxg,iv:AMo/34KOwf0EppUTtX6391Dm0E3orpV9/iGLEDFNcfg=,tag:Ynph1PWmHK1P6Gf3UdbnZA==,type:str]
- htpasswd: ENC[AES256_GCM,data:OPjAkq1yVadTdlvHVScANxtrNjVd5MAJZnUMPjgR0U/thnXnm3ocNMz8dRw9CdbJIHFk8RBcVNIE2VeKWW+/wl+kY1hC,iv:IVm2Bb52mtJkUSPKRgGoFi7rn5KzJAXuaLgMVwYlz/k=,tag:qjXsKcCPM3cZBrl7GfHalw==,type:str]
+ config.cfg: ENC[AES256_GCM,data:gnF9AHWPxE3WoD1EqBXGP5T+9/7jueKjA9O2VTa79lbjxG1fOwjzB9OJ1j2FNvKAONlTxofjn4X+akIpZavr0HsfjB5PkCgXRc9a9nVg0gCiJ/ExOSUMbMudh49AY97EpyhuXcxKHn2hTxgN01xsG4Fc9ze7DwUHw2+ChmdbKe+2LjzgOztzLSC1cAIHQRtPLzqKV+2mdlmprjp78MaxzohNkQYKsldVw30T0nim6+nBqcydm8nMpHEW0QByw3ZPhd0zGW57lePPY4KaGGVt8gOtzyT4MW1b+WTP+jBf2PGJIsikMjF+SSHMZKTWxHTDxgmieHtP228uNajUCndE7gIx7EaUf8dFCVOjvOPb+G1Ii6Hkv+Hhnr2jWygXUeUWLK7yG22e,iv:z7Rc5YKZR0g0osX7yJWtCB4VhStfyByw87nkFKjGe+M=,tag:lLdXbhFKcZ25dR7VCm+DPg==,type:str]
+ htpasswd: ENC[AES256_GCM,data:UwIqhzNgVzYAH4QeH/4ZcMh4L+K80RNCJwWWHzCSGSj+/ZrJwAb2CRP9V6ODBe8YxsMy0k6dQBeVlWyHp7/wiAyoWaOp,iv:uRJjT58biisEI+GxVEpp0iY1eGnFZX9QQO43KVcHkHs=,tag:IYtmC9/3bbOlSZdxo6+tsQ==,type:str]
persistence:
data:
- enabled: ENC[AES256_GCM,data:5xdUYQ==,iv:Fx25cSv+iex4tF0Lw+a+XPPfNdVOlhYMw9ZV1tmemBw=,tag:gx0jYGD1lG21PzAD332IDA==,type:bool]
- storageClass: ENC[AES256_GCM,data:g6ZPCY1C8DpnRA==,iv:/8EQgJSV2h4vTFFVWABD4uV7tQ3sDHe8hEx0Mfd2LmE=,tag:jrvNs7Ue/a/6J2rpHKYxNQ==,type:str]
- accessMode: ENC[AES256_GCM,data:raiYqI4WMIm0K1thHA==,iv:3/qraamD0jCB6hp6cIt8bIbbjDflFYlaNbH7NhL+yiE=,tag:DQAdE3opioK73ByRWyCiTA==,type:str]
- size: ENC[AES256_GCM,data:/Jym,iv:yEhjltTClNf4GBBtWhVkh/vw2otBLYaKU3g8R0xFEg8=,tag:v2SDzhTmv0LsDHaTBR4knA==,type:str]
- volumeName: ENC[AES256_GCM,data:xQCkk14GK8T7Y1jsMI+SaRVwR7T/Yzq+A/fOTNJAcU6IvWYOSRp9TQ==,iv:Qz/d83JAArZFqP4jMhrWqhVNd+07tkVa+Z5Oma5KB8w=,tag:AmJTgR3Oeuv7tz/Sv9tSHA==,type:str]
+ enabled: ENC[AES256_GCM,data:kzbnGg==,iv:g9RQVxtT0X1iBQ1xuJdtMvsOzryEZsdp7aTiUAbqm2M=,tag:KlaYjnIlukrXciIrYbzf8w==,type:bool]
+ storageClass: ENC[AES256_GCM,data:aDlGc22ltPNeJg==,iv:d1Kvs6M5Kf9RANLHRWfltFwI7fKHtCR+v9Fen/WLfGA=,tag:msAyivjz/J2iGhP50QKYRQ==,type:str]
+ accessMode: ENC[AES256_GCM,data:uqiJJDCWbG93pJs00A==,iv:raWkKPpwhVAaNHfv4uiSb5O9G8dmubOsEtY6ird34KQ=,tag:Se69czzY0ntJnuu5x2yzVA==,type:str]
+ size: ENC[AES256_GCM,data:VtN5,iv:nsrdnqC7oS8dau6Mf9Ul1s3Mc6oq1OoDS1AkqUjbsC8=,tag:0CEv8ndxvTPGuW6NkS/smA==,type:str]
+ volumeName: ENC[AES256_GCM,data:sZ03/HlaWhJAe4PYbQmXHAHdDzYeqA4TryCVB5YV6KQ7m3ivfJzMxQ==,iv:GxiCQ3FJ+rU2IjL2gtAHghFN+XdfFXl8rZ0g5PzfbuE=,tag:8mxpVvrwHucW3dkip261eA==,type:str]
htpasswd:
enabled: true
type: configMap
@@ -74,14 +74,14 @@ sops:
- recipient: age1esjyg2qfy49awv0ptkzvpk425adczjr38m37w2mmcahzc4p8n54sll2nzh
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
- YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVdzlwZjNJVUhmVG40T0pS
- eGJPTnNkNEx6TWxvRlQwVksyWWJLVjlpVWw4Cm82b0RMb1VJdUNWN2FEMm5TSENG
- akExb1paS3Z6Tyt4L3V4dXo0d3lkQ28KLS0tIHpNZVEwYUZ3a1VwVUtoRW52clZk
- YVJmUjgvb2FwUmRIUTR0LzJoTVNPdmcKzWAyDhDkpKR/j41pmevAWb6KuNuXN0n1
- fkc0cWbguHRhBvGuhWQ+ywdFbFqTpJighhynUlEbAxH927paHGaNwg==
+ YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVc0NCS3FsVHp5SWhHempO
+ MDRqbnZqVWN3V3NjN1crajA1bytOSjZQNFVBCldIc2tCUFFJZTlqTk0zUGorMEEx
+ L0xOOEFHTzQvblVUMW1xSCtWQTFsR1kKLS0tIE1QUVpvS29UUldFNmd1aWJLaWFr
+ MU1MQzM5SDBwLyt4TldLVzZHS0NVM3cKNirS35/m5nEetVd1KrZQYQn1RQZmvC32
+ TmhcbaepnGXSsn3zIAdUTM8yZoe5ytmWmIJQkfYVfMjFodO+ans2gA==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2024-02-19T14:15:40Z"
- mac: ENC[AES256_GCM,data:nMz21HBr7b0gXGylcIEZn9Wsq8DpPLts3akMyHdlaC+z8PhUzE3HflGXTMwpW1AjpECna6ENyMKHfuZPmiJvzxEcOZLgF/QfXpVGhTvk6jvcJA9N6v0jHu8xq1DcbmS2SrHHExhQgGuHjk/cF8dIteFh17znJkbP4f7MniRcnXU=,iv:64nLLOXaFb9C89V7+ZR+c6emxyol2XqJrfIYNsXqMb8=,tag:rj7cc98dFhplUmTZ8Fc51A==,type:str]
+ lastmodified: "2024-02-19T14:22:12Z"
+ mac: ENC[AES256_GCM,data:mtnaf1zctzzbEB3nOsYyxFGgDfadF3RzXrbja1wnDmbpEzIhre7kaOEF/qJa34QRH7mdhqvfPvse7wMxMTsVIDTeeLVxGUGY7liZ86xA8yBsOps+XoL511RRtkMZJHUmjmPlGpk4VTuY/zsUT+7vdDg55DCNH1E93YPMGPxyJtg=,iv:bGxerHG/LYEcMCFJGDDUT67pmQRcoCZXC6uXnyCQ24M=,tag:KxJ1ggTa1HWJuXYObpn34w==,type:str]
pgp: []
encrypted_regex: ^(secret_key|adminPassword|admin_pass|admin_email|mariadbPassword|mariadbRootPassword|privateKey|data|stringData|PASSWD|password|pass|postgresPassword|postgresqlPassword|redminePassword|smtpPassword|registration_shared_secret|shared_secret|secret)$
version: 3.8.1