From 7cf6df6fb15e192aa5db87bdb7fd11728f726b39 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Mon, 21 Aug 2023 23:47:01 +0100 Subject: [PATCH] chore: force http for caddy reverse_proxy --- deploy/dev/cm.yaml | 4 ++-- deploy/prod/cm.yaml | 4 ++-- src/middleware.ts | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deploy/dev/cm.yaml b/deploy/dev/cm.yaml index f4301919..cb9f6a15 100644 --- a/deploy/dev/cm.yaml +++ b/deploy/dev/cm.yaml @@ -19,7 +19,7 @@ data: dns cloudflare {env.CF_API_TOKEN} } - reverse_proxy xlog-internal.crossbell.svc:3000 { + reverse_proxy http://xlog-internal.crossbell.svc:3000 { header_up X-Forwarded-Host {host} } } @@ -33,7 +33,7 @@ data: on_demand } - reverse_proxy xlog-internal.crossbell.svc:3000 { + reverse_proxy http://xlog-internal.crossbell.svc:3000 { header_up X-Forwarded-Host {host} } } diff --git a/deploy/prod/cm.yaml b/deploy/prod/cm.yaml index 9d4f2a77..697e969b 100644 --- a/deploy/prod/cm.yaml +++ b/deploy/prod/cm.yaml @@ -19,7 +19,7 @@ data: dns cloudflare {env.CF_API_TOKEN} } - reverse_proxy xlog-internal.crossbell.svc:3000 { + reverse_proxy http://xlog-internal.crossbell.svc:3000 { header_up X-Forwarded-Host {host} } } @@ -33,7 +33,7 @@ data: on_demand } - reverse_proxy xlog-internal.crossbell.svc:3000 { + reverse_proxy http://xlog-internal.crossbell.svc:3000 { header_up X-Forwarded-Host {host} } } diff --git a/src/middleware.ts b/src/middleware.ts index c2324874..f9c43884 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -92,7 +92,10 @@ export default async function middleware(req: NextRequest) { if (tenant?.subdomain) { return NextResponse.rewrite( - new URL(`/site/${tenant?.subdomain}${pathname}`, req.url), + new URL( + `/site/${tenant?.subdomain}${pathname}${req.nextUrl.search}`, + req.url, + ), { request: { headers: requestHeaders,