Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(traefik): update server configuration to use new host parameter and ensure HTTPS is set correctly

Browse Source 
- Modified the updateServerTraefik function to utilize the newHost parameter instead of user.host.
- Ensured the HTTPS field is correctly initialized in the test for server configuration.
This commit is contained in:
Mauricio Siu 2025-04-06 02:37:15 -06:00
parent e5a3e56e13
commit bca6af77fd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/__test__/traefik/server/update-server-config.test.ts
View File

@ -74,7 +74,6 @@ beforeEach(() => {
test("Should read the configuration file", () => { test("Should read the configuration file", () => {
const config: FileConfig = loadOrCreateConfig("dokploy"); const config: FileConfig = loadOrCreateConfig("dokploy");
expect(config.http?.routers?.["dokploy-router-app"]?.service).toBe( expect(config.http?.routers?.["dokploy-router-app"]?.service).toBe(
"dokploy-service-app", "dokploy-service-app",
); );
@ -84,6 +83,7 @@ test("Should apply redirect-to-https", () => {
updateServerTraefik( updateServerTraefik(
{ {
...baseAdmin, ...baseAdmin,
https: true,
certificateType: "letsencrypt", certificateType: "letsencrypt",
}, },
"example.com", "example.com",

6
packages/server/src/utils/traefik/web-server.ts
View File

@ -15,7 +15,7 @@ export const updateServerTraefik = (
user: User | null, user: User | null,
newHost: string | null, newHost: string | null,
) => { ) => {
const { https, host, certificateType } = user || {}; const { https, certificateType } = user || {};
const appName = "dokploy"; const appName = "dokploy";
const config: FileConfig = loadOrCreateConfig(appName); const config: FileConfig = loadOrCreateConfig(appName);
@ -24,7 +24,7 @@ export const updateServerTraefik = (
config.http.services = config.http.services || {}; config.http.services = config.http.services || {};
const currentRouterConfig = config.http.routers[`${appName}-router-app`] || { const currentRouterConfig = config.http.routers[`${appName}-router-app`] || {
rule: `Host(\`${host}\`)`, rule: `Host(\`${newHost}\`)`,
service: `${appName}-service-app`, service: `${appName}-service-app`,
entryPoints: ["web"], entryPoints: ["web"],
}; };
@ -66,7 +66,7 @@ export const updateServerTraefik = (
currentRouterConfig.middlewares = []; currentRouterConfig.middlewares = [];
} }
if (user?.host) { if (newHost) {
writeTraefikConfig(config, appName); writeTraefikConfig(config, appName);
} else { } else {
removeTraefikConfig(appName); removeTraefikConfig(appName);