fix: WIP Traefik

src/lib/haproxy/index.ts

@@ -122,6 +122,7 @@ export async function stopTcpHttpProxy(
 	}
 	if (forceName) containerName = forceName;
 	const found = await checkContainer(engine, containerName);
+
 	try {
 		if (found) {
 			return await asyncExecShell(
@@ -137,15 +138,15 @@ export async function startTraefikTCPProxy(
 	id: string,
 	publicPort: number,
 	privatePort: number,
-	volume?: string
+	type?: string
 ): Promise<{ stdout: string; stderr: string } | Error> {
 	const { network, engine } = destinationDocker;
 	const host = getEngine(engine);
-
 	const containerName = `${id}-${publicPort}`;
 	const found = await checkContainer(engine, containerName, true);
-	const foundDependentContainer = await checkContainer(engine, id, true);
+	let dependentId = id;
-
+	if (type === 'wordpressftp') dependentId = `${id}-ftp`;
+	const foundDependentContainer = await checkContainer(engine, dependentId, true);
 	try {
 		if (foundDependentContainer && !found) {
 			const { stdout: Config } = await asyncExecShell(
@@ -210,7 +211,6 @@ export async function startTcpProxy(
 	const containerName = `haproxy-for-${publicPort}`;
 	const found = await checkContainer(engine, containerName, true);
 	const foundDependentContainer = await checkContainer(engine, id, true);
-
 	try {
 		if (foundDependentContainer && !found) {
 			const { stdout: Config } = await asyncExecShell(

src/lib/queues/proxyTcpHttp.ts

@@ -71,7 +71,7 @@ export default async function (): Promise<void | {
 							ftpPublicPort,
 							`haproxy-for-${ftpPublicPort}`
 						);
-						await startTraefikTCPProxy(destinationDocker, `${id}-ftp`, ftpPublicPort, 22);
+						await startTraefikTCPProxy(destinationDocker, id, ftpPublicPort, 22, 'wordpressftp');
 					} else {
 						await stopTcpHttpProxy(id, destinationDocker, ftpPublicPort, `${id}-${ftpPublicPort}`);
 						await startTcpProxy(destinationDocker, `${id}-ftp`, ftpPublicPort, 22);

src/routes/services/[id]/wordpress/ftp.json.ts

@@ -36,12 +36,16 @@ export const post: RequestHandler = async (event) => {
 		});
 		const {
 			service: { destinationDockerId, destinationDocker },
-			ftpPublicPort: oldPublicPort,
+			ftpPublicPort,
 			ftpUser: user,
 			ftpPassword: savedPassword,
 			ftpHostKey,
 			ftpHostKeyPrivate
 		} = data;
+		const { network, engine } = destinationDocker;
+		const settings = await db.prisma.setting.findFirst();
+		const host = getEngine(engine);
+		if (ftpEnabled) {
 			if (user) ftpUser = user;
 			if (savedPassword) ftpPassword = decrypt(savedPassword);
 
@@ -76,9 +80,7 @@ export const post: RequestHandler = async (event) => {
 				} else {
 					await asyncExecShell(`echo "${decrypt(ftpHostKeyPrivate)}" > ${hostkeyDir}/${id}.rsa`);
 				}
-			const { network, engine } = destinationDocker;
+
-			const host = getEngine(engine);
-			if (ftpEnabled) {
 				await db.prisma.wordpress.update({
 					where: { serviceId: id },
 					data: {
@@ -147,12 +149,15 @@ export const post: RequestHandler = async (event) => {
 				await asyncExecShell(
 					`DOCKER_HOST=${host} docker compose -f ${hostkeyDir}/${id}-docker-compose.yml up -d`
 				);
-				const settings = await db.prisma.setting.findFirst();
-				if (settings.isTraefikUsed) {
-					await startTraefikTCPProxy(destinationDocker, `${id}-ftp`, publicPort, 22);
-				} else {
-					await startTcpProxy(destinationDocker, `${id}-ftp`, publicPort, 22);
 			}
+			return {
+				status: 201,
+				body: {
+					publicPort,
+					ftpUser,
+					ftpPassword
+				}
+			};
 		} else {
 			await db.prisma.wordpress.update({
 				where: { serviceId: id },
@@ -165,19 +170,7 @@ export const post: RequestHandler = async (event) => {
 			} catch (error) {
 				//
 			}
-				await stopTcpHttpProxy(destinationDocker, oldPublicPort);
+			await stopTcpHttpProxy(id, destinationDocker, ftpPublicPort);
-			}
-		}
-		if (ftpEnabled) {
-			return {
-				status: 201,
-				body: {
-					publicPort,
-					ftpUser,
-					ftpPassword
-				}
-			};
-		} else {
 			return {
 				status: 200,
 				body: {}

src/routes/settings/index.svelte

@@ -166,7 +166,7 @@
 			await post(`/update.json`, { type: to });
 			const data = await get(`/settings.json`);
 			$isTraefikUsed = data.settings.isTraefikUsed;
-			return toast.push('Proxy migration completed.');
+			return toast.push('Proxy migration started, it takes a few seconds.');
 		} catch ({ error }) {
 			return errorNotification(error);
 		} finally {

src/routes/update.json.ts

@@ -64,12 +64,12 @@ export const post: RequestHandler = async (event) => {
 		}
 	} else if (type === 'traefik') {
 		try {
-			const found = await checkContainer('/var/run/docker.sock', 'coolify-haproxy');
+			// const found = await checkContainer('/var/run/docker.sock', 'coolify-haproxy');
-			if (found) {
+			// if (found) {
-				await asyncExecShell(`docker stop -t 0 coolify-haproxy`);
+			// 	await asyncExecShell(`docker stop -t 0 coolify-haproxy`);
-				await asyncExecShell(`docker rm coolify-haproxy`);
+			// 	await asyncExecShell(`docker rm coolify-haproxy`);
-			}
+			// }
-			await startTraefikProxy('/var/run/docker.sock');
+			// await startTraefikProxy('/var/run/docker.sock');
 			await db.prisma.setting.update({
 				where: { id: settings.id },
 				data: { isTraefikUsed: true }
@@ -83,12 +83,12 @@ export const post: RequestHandler = async (event) => {
 		}
 	} else if (type === 'haproxy') {
 		try {
-			const found = await checkContainer('/var/run/docker.sock', 'coolify-proxy');
+			// const found = await checkContainer('/var/run/docker.sock', 'coolify-proxy');
-			if (found) {
+			// if (found) {
-				await asyncExecShell(`docker stop -t 0 coolify-proxy`);
+			// 	await asyncExecShell(`docker stop -t 0 coolify-proxy`);
-				await asyncExecShell(`docker rm coolify-proxy`);
+			// 	await asyncExecShell(`docker rm coolify-proxy`);
-			}
+			// }
-			await startCoolifyProxy('/var/run/docker.sock');
+			// await startCoolifyProxy('/var/run/docker.sock');
 			await db.prisma.setting.update({
 				where: { id: settings.id },
 				data: { isTraefikUsed: false }

src/routes/webhooks/traefik/other.json.ts

@@ -40,14 +40,14 @@ export const get: RequestHandler = async (event) => {
 					traefik = {
 						[type]: {
 							routers: {
-								[`${id}-${publicPort}`]: {
+								[id]: {
 									entrypoints: [type],
 									rule: `Host(\`${domain}\`)`,
-									service: `${id}-${publicPort}`
+									service: id
 								}
 							},
 							services: {
-								[`${id}-${publicPort}`]: {
+								[id]: {
 									loadbalancer: {
 										servers: [{ url: `http://${id}:${privatePort}` }]
 									}