From 0ee5a6f13e0343343958cb8d10dcaedbd4536f05 Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Mon, 23 Dec 2024 09:16:01 -0500 Subject: [PATCH] fix(certificates): ensure certificates are accessible by traefik --- packages/server/src/constants/index.ts | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts index f2f1a4d88..b6dfd2177 100644 --- a/packages/server/src/constants/index.ts +++ b/packages/server/src/constants/index.ts @@ -5,34 +5,22 @@ export const IS_CLOUD = process.env.IS_CLOUD === "true"; export const docker = new Docker(); export const paths = (isServer = false) => { - if (isServer) { - const BASE_PATH = "/etc/dokploy"; - return { - BASE_PATH, - MAIN_TRAEFIK_PATH: `${BASE_PATH}/traefik`, - DYNAMIC_TRAEFIK_PATH: `${BASE_PATH}/traefik/dynamic`, - LOGS_PATH: `${BASE_PATH}/logs`, - APPLICATIONS_PATH: `${BASE_PATH}/applications`, - COMPOSE_PATH: `${BASE_PATH}/compose`, - SSH_PATH: `${BASE_PATH}/ssh`, - CERTIFICATES_PATH: `${BASE_PATH}/certificates`, - MONITORING_PATH: `${BASE_PATH}/monitoring`, - REGISTRY_PATH: `${BASE_PATH}/registry`, - }; - } const BASE_PATH = - process.env.NODE_ENV === "production" + isServer || process.env.NODE_ENV === "production" ? "/etc/dokploy" : path.join(process.cwd(), ".docker"); + const MAIN_TRAEFIK_PATH = `${BASE_PATH}/traefik`; + const DYNAMIC_TRAEFIK_PATH = `${MAIN_TRAEFIK_PATH}/dynamic`; + return { BASE_PATH, - MAIN_TRAEFIK_PATH: `${BASE_PATH}/traefik`, - DYNAMIC_TRAEFIK_PATH: `${BASE_PATH}/traefik/dynamic`, + MAIN_TRAEFIK_PATH, + DYNAMIC_TRAEFIK_PATH, LOGS_PATH: `${BASE_PATH}/logs`, APPLICATIONS_PATH: `${BASE_PATH}/applications`, COMPOSE_PATH: `${BASE_PATH}/compose`, SSH_PATH: `${BASE_PATH}/ssh`, - CERTIFICATES_PATH: `${BASE_PATH}/certificates`, + CERTIFICATES_PATH: `${DYNAMIC_TRAEFIK_PATH}/certificates`, MONITORING_PATH: `${BASE_PATH}/monitoring`, REGISTRY_PATH: `${BASE_PATH}/registry`, };