From 9a05bfa8999b514d46c92eec3e453efd1fd53993 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 6 Apr 2022 10:30:53 +0200
Subject: [PATCH] fix: Fix for fix haha

---
 src/routes/services/[id]/wordpress/settings.json.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/routes/services/[id]/wordpress/settings.json.ts b/src/routes/services/[id]/wordpress/settings.json.ts
index 3356be86b..796510989 100644
--- a/src/routes/services/[id]/wordpress/settings.json.ts
+++ b/src/routes/services/[id]/wordpress/settings.json.ts
@@ -132,9 +132,6 @@ export const post: RequestHandler = async (event) => {
 				);
 
 				await startTcpProxy(destinationDocker, `${id}-ftp`, publicPort, 22);
-				await asyncExecShell(
-					`rm -f ${hostkeyDir}/${id}-docker-compose.yml ${hostkeyDir}/${id}.ed25519 ${hostkeyDir}/${id}.ed25519.pub ${hostkeyDir}/${id}.rsa ${hostkeyDir}/${id}.rsa.pub`
-				);
 			} else {
 				await db.prisma.wordpress.update({
 					where: { serviceId: id },
@@ -152,9 +149,6 @@ export const post: RequestHandler = async (event) => {
 					//
 				}
 				await stopTcpHttpProxy(destinationDocker, oldPublicPort);
-				await asyncExecShell(
-					`rm -f ${hostkeyDir}/${id}-docker-compose.yml ${hostkeyDir}/${id}.ed25519 ${hostkeyDir}/${id}.ed25519.pub ${hostkeyDir}/${id}.rsa ${hostkeyDir}/${id}.rsa.pub `
-				);
 			}
 		}
 		if (ftpEnabled) {
@@ -175,5 +169,9 @@ export const post: RequestHandler = async (event) => {
 	} catch (error) {
 		console.log(error);
 		return ErrorHandler(error);
+	} finally {
+		await asyncExecShell(
+			`rm -f ${hostkeyDir}/${id}-docker-compose.yml ${hostkeyDir}/${id}.ed25519 ${hostkeyDir}/${id}.ed25519.pub ${hostkeyDir}/${id}.rsa ${hostkeyDir}/${id}.rsa.pub `
+		);
 	}
 };