From 6f91591448d7cb4caecce9a4bcd9f2c4565bc330 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 29 Nov 2022 15:45:18 +0100 Subject: [PATCH] fix: webhook previewseparator --- apps/api/src/routes/webhooks/traefik/handlers.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts index 18bdcfebf..2bfe779e7 100644 --- a/apps/api/src/routes/webhooks/traefik/handlers.ts +++ b/apps/api/src/routes/webhooks/traefik/handlers.ts @@ -171,8 +171,8 @@ export async function proxyConfiguration(request: FastifyRequest, remote }; try { const { id = null } = request.params; - const settings = await prisma.setting.findFirst(); - if (settings.isTraefikUsed && settings.proxyDefaultRedirect) { + const coolifySettings = await prisma.setting.findFirst(); + if (coolifySettings.isTraefikUsed && coolifySettings.proxyDefaultRedirect) { traefik.http.routers['catchall-http'] = { entrypoints: ["web"], rule: "HostRegexp(`{catchall:.*}`)", @@ -190,7 +190,7 @@ export async function proxyConfiguration(request: FastifyRequest, remote traefik.http.middlewares['redirect-regexp'] = { redirectregex: { regex: '(.*)', - replacement: settings.proxyDefaultRedirect, + replacement: coolifySettings.proxyDefaultRedirect, permanent: false } } @@ -340,7 +340,8 @@ export async function proxyConfiguration(request: FastifyRequest, remote .map((c) => c.replace(/"/g, '')); if (containers.length > 0) { for (const container of containers) { - const previewDomain = `${container.split('-')[1]}.${domain}`; + const previewDomain = `${container.split('-')[1]}${coolifySettings.previewSeparator}${domain}`; + console.log(previewDomain) const nakedDomain = previewDomain.replace(/^www\./, ''); const pathPrefix = '/' const serviceId = `${container}-${port || 'default'}`