From 069f1a7b7a292f880a5bf737fa99c73af4b08e8e Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 21 Sep 2024 21:17:03 -0600
Subject: [PATCH] refactor(multi-server): add serverIp

---
 apps/dokploy/components/dashboard/settings/web-server.tsx   | 2 +-
 apps/dokploy/server/api/routers/server.ts                   | 5 ++---
 .../servers/setup-server.ts => setup/server-setup.ts}       | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename apps/dokploy/server/{utils/servers/setup-server.ts => setup/server-setup.ts} (97%)

diff --git a/apps/dokploy/components/dashboard/settings/web-server.tsx b/apps/dokploy/components/dashboard/settings/web-server.tsx
index 4a5f2284..68a0c790 100644
--- a/apps/dokploy/components/dashboard/settings/web-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server.tsx
@@ -39,7 +39,7 @@ export const WebServer = ({ className }: Props) => {
 
 				<div className="flex items-center flex-wrap justify-between gap-4">
 					<span className="text-sm text-muted-foreground">
-						Server IP: {data?.host}
+						Server IP: {data?.serverIp}
 					</span>
 					<span className="text-sm text-muted-foreground">
 						Version: {dokployVersion}
diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts
index cb9f7673..1bdb373e 100644
--- a/apps/dokploy/server/api/routers/server.ts
+++ b/apps/dokploy/server/api/routers/server.ts
@@ -3,12 +3,11 @@ import { db } from "@/server/db";
 import {
 	apiCreateServer,
 	apiFindOneServer,
-	apiRemoveProject,
 	apiRemoveServer,
 	apiUpdateServer,
 	server,
 } from "@/server/db/schema";
-import { setupServer } from "@/server/utils/servers/setup-server";
+import { serverSetup } from "@/server/setup/server-setup";
 import { TRPCError } from "@trpc/server";
 import { desc, isNotNull } from "drizzle-orm";
 import { removeDeploymentsByServerId } from "../services/deployment";
@@ -56,7 +55,7 @@ export const serverRouter = createTRPCRouter({
 		.input(apiFindOneServer)
 		.mutation(async ({ input, ctx }) => {
 			try {
-				const currentServer = await setupServer(input.serverId);
+				const currentServer = await serverSetup(input.serverId);
 				return currentServer;
 			} catch (error) {
 				throw new TRPCError({
diff --git a/apps/dokploy/server/utils/servers/setup-server.ts b/apps/dokploy/server/setup/server-setup.ts
similarity index 97%
rename from apps/dokploy/server/utils/servers/setup-server.ts
rename to apps/dokploy/server/setup/server-setup.ts
index 825c9926..83a04068 100644
--- a/apps/dokploy/server/utils/servers/setup-server.ts
+++ b/apps/dokploy/server/setup/server-setup.ts
@@ -12,10 +12,10 @@ import {
 	getDefaultServerTraefikConfig,
 } from "@/server/setup/traefik-setup";
 import { Client } from "ssh2";
-import { recreateDirectory } from "../filesystem/directory";
-import { readSSHKey } from "../filesystem/ssh";
+import { recreateDirectory } from "../utils/filesystem/directory";
+import { readSSHKey } from "../utils/filesystem/ssh";
 
-export const setupServer = async (serverId: string) => {
+export const serverSetup = async (serverId: string) => {
 	const server = await findServerById(serverId);
 	const { LOGS_PATH } = paths();