From 9a4b474cdc3aba50c1fd71fc6d18f4e60802a674 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Thu, 25 Jul 2024 02:04:54 -0600
Subject: [PATCH] refactor(traefik-setup): change order of chmodsync

---
 server/setup/traefik-setup.ts | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/server/setup/traefik-setup.ts b/server/setup/traefik-setup.ts
index 7a5fee4f..e9f27860 100644
--- a/server/setup/traefik-setup.ts
+++ b/server/setup/traefik-setup.ts
@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, writeFileSync, chmodSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import type { CreateServiceOptions } from "dockerode";
 import { dump } from "js-yaml";
@@ -86,17 +86,10 @@ export const initializeTraefik = async () => {
 
 export const createDefaultServerTraefikConfig = () => {
 	const configFilePath = path.join(DYNAMIC_TRAEFIK_PATH, "dokploy.yml");
-	const acmeJsonPath = path.join(DYNAMIC_TRAEFIK_PATH, "acme.json");
-	
-	if (existsSync(acmeJsonPath)) {
-	    chmodSync(acmeJsonPath, '600');
-	} else {
-	    console.error(`File not found: ${acmeJsonPath}`);
-	}
-	
+
 	if (existsSync(configFilePath)) {
-	    console.log("Default traefik config already exists");
-	    return;
+		console.log("Default traefik config already exists");
+		return;
 	}
 
 	const appName = "dokploy";
@@ -133,6 +126,11 @@ export const createDefaultServerTraefikConfig = () => {
 
 export const createDefaultTraefikConfig = () => {
 	const mainConfig = path.join(MAIN_TRAEFIK_PATH, "traefik.yml");
+	const acmeJsonPath = path.join(DYNAMIC_TRAEFIK_PATH, "acme.json");
+
+	if (existsSync(acmeJsonPath)) {
+		chmodSync(acmeJsonPath, "600");
+	}
 	if (existsSync(mainConfig)) {
 		console.log("Main config already exists");
 		return;
@@ -192,12 +190,6 @@ export const createDefaultTraefikConfig = () => {
 	const yamlStr = dump(configObject);
 	mkdirSync(MAIN_TRAEFIK_PATH, { recursive: true });
 	writeFileSync(mainConfig, yamlStr, "utf8");
-	const acmeJsonPath = "/etc/dokploy/traefik/dynamic/acme.json";
-	if (existsSync(acmeJsonPath)) {
-	    chmodSync(acmeJsonPath, '600');
-	} else {
-	    console.error(`File not found: ${acmeJsonPath}, func createDefaultTraefikConfig`);
-	}
 };
 
 export const createDefaultMiddlewares = () => {