Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(multi-server): add serverIp

Browse Source
This commit is contained in:
Mauricio Siu
2024-09-21 21:17:03 -06:00
parent 807137d3b1
commit 069f1a7b7a
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/components/dashboard/settings/web-server.tsx
View File

@@ -39,7 +39,7 @@ export const WebServer = ({ className }: Props) => {
<div className="flex items-center flex-wrap justify-between gap-4"> <div className="flex items-center flex-wrap justify-between gap-4">
<span className="text-sm text-muted-foreground"> <span className="text-sm text-muted-foreground">
Server IP: {data?.host} Server IP: {data?.serverIp}
</span> </span>
<span className="text-sm text-muted-foreground"> <span className="text-sm text-muted-foreground">
Version: {dokployVersion} Version: {dokployVersion}

5
apps/dokploy/server/api/routers/server.ts
View File

@@ -3,12 +3,11 @@ import { db } from "@/server/db";
import { import {
apiCreateServer, apiCreateServer,
apiFindOneServer, apiFindOneServer,
apiRemoveProject,
apiRemoveServer, apiRemoveServer,
apiUpdateServer, apiUpdateServer,
server, server,
} from "@/server/db/schema"; } 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 { TRPCError } from "@trpc/server";
import { desc, isNotNull } from "drizzle-orm"; import { desc, isNotNull } from "drizzle-orm";
import { removeDeploymentsByServerId } from "../services/deployment"; import { removeDeploymentsByServerId } from "../services/deployment";
@@ -56,7 +55,7 @@ export const serverRouter = createTRPCRouter({
.input(apiFindOneServer) .input(apiFindOneServer)
.mutation(async ({ input, ctx }) => { .mutation(async ({ input, ctx }) => {
try { try {
const currentServer = await setupServer(input.serverId); const currentServer = await serverSetup(input.serverId);
return currentServer; return currentServer;
} catch (error) { } catch (error) {
throw new TRPCError({ throw new TRPCError({

6
apps/dokploy/server/utils/servers/setup-server.ts → apps/dokploy/server/setup/server-setup.ts
View File

@@ -12,10 +12,10 @@ import {
getDefaultServerTraefikConfig, getDefaultServerTraefikConfig,
} from "@/server/setup/traefik-setup"; } from "@/server/setup/traefik-setup";
import { Client } from "ssh2"; import { Client } from "ssh2";
import { recreateDirectory } from "../filesystem/directory"; import { recreateDirectory } from "../utils/filesystem/directory";
import { readSSHKey } from "../filesystem/ssh"; import { readSSHKey } from "../utils/filesystem/ssh";
export const setupServer = async (serverId: string) => { export const serverSetup = async (serverId: string) => {
const server = await findServerById(serverId); const server = await findServerById(serverId);
const { LOGS_PATH } = paths(); const { LOGS_PATH } = paths();