From e6f8d35f80a283991badd6bb8a2917b7009c99d7 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 17 Mar 2023 16:09:04 +0000 Subject: [PATCH] updated mdw --- k8s/applications/nextcloud/values.yaml | 3 +++ .../templates/middleware-nextcloud.yaml | 19 +++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/k8s/applications/nextcloud/values.yaml b/k8s/applications/nextcloud/values.yaml index db1ab8a..ffa40a1 100644 --- a/k8s/applications/nextcloud/values.yaml +++ b/k8s/applications/nextcloud/values.yaml @@ -29,6 +29,9 @@ nextcloud: 0 => '127.0.0.1', 1 => '10.0.0.0/8', ), + 'overwritehost' => 'ssl-proxy.tld', + 'overwriteprotocol' => 'https', + 'overwritewebroot' => '/domain.tld/nextcloud', 'forwarded_for_headers' => array('HTTP_X_FORWARDED_FOR'), ); strategy: diff --git a/k8s/infra/ingresses/templates/middleware-nextcloud.yaml b/k8s/infra/ingresses/templates/middleware-nextcloud.yaml index b4cb1d4..53678b9 100644 --- a/k8s/infra/ingresses/templates/middleware-nextcloud.yaml +++ b/k8s/infra/ingresses/templates/middleware-nextcloud.yaml @@ -7,9 +7,9 @@ metadata: spec: chain: middlewares: - - name: https-only - - name: strict-transport + - name: https-redirect - name: well-known + - name: strict-transport --- apiVersion: traefik.containo.us/v1alpha1 @@ -18,16 +18,16 @@ metadata: name: well-known namespace: app-nextcloud spec: - redirectRegex: + replacePathRegex: permanent: true - regex: "https://(.*)/.well-known/(?:card|cal)dav" - replacement: "https://${1}/remote.php/dav" + regex: "^/.well-known/ca(l|rd)dav" + replacement: "/remote.php/dav/" --- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: - name: https-only + name: https-redirect namespace: app-nextcloud spec: redirectScheme: @@ -40,7 +40,6 @@ metadata: name: strict-transport spec: headers: - customRequestHeaders: - "Strict-Transport-Security": "max-age=15552000; includeSubDomains" - customResponseHeaders: - "Strict-Transport-Security": "max-age=15552000; includeSubDomains" + hostsProxyHeaders: + - "X-Forwarded-Host" + referrerPolicy: "same-origin"