-
@@ -50,139 +50,116 @@ export default function SwarmMonitorCard({ serverId }: Props) {
);
}
- const totalNodes = nodes.length;
- const activeNodesCount = nodes.filter(
- (node) => node.Status === "Ready",
- ).length;
- const managerNodesCount = nodes.filter(
- (node) =>
- node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
- ).length;
+ const totalNodes = nodes.length;
+ const activeNodesCount = nodes.filter((node) => node.Status === "Ready").length;
+ const managerNodesCount = nodes.filter((node) =>node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable").length;
+ const activeNodes = nodes.filter((node) => node.Status === "Ready");
+ const managerNodes = nodes.filter((node) => node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable");
- const activeNodes = nodes.filter((node) => node.Status === "Ready");
- const managerNodes = nodes.filter(
- (node) =>
- node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
- );
+ return (
+
+
+
- const getStatusIcon = (status: string) => {
- switch (status) {
- case "Ready":
- return
;
- case "Down":
- return
;
- case "Disconnected":
- return
;
- default:
- return
;
- }
- };
+
+
+
+ Total Nodes
+
+
+
+
+ {totalNodes}
+
+
- return (
-
-
-
Docker Swarm Overview
- {!serverId && (
-
- window.location.replace("/dashboard/settings/cluster")
- }
- >
- Manage Cluster
-
- )}
-
-
-
-
-
-
-
-
-
- Total Nodes:
- {totalNodes}
-
-
-
Active Nodes:
-
-
-
-
- {activeNodesCount} / {totalNodes}
-
-
-
-
- {activeNodes.map((node) => (
-
- {getStatusIcon(node.Status)}
- {node.Hostname}
-
- ))}
-
-
-
-
-
-
Manager Nodes:
-
-
-
-
- {managerNodesCount} / {totalNodes}
-
-
-
-
- {managerNodes.map((node) => (
-
- {getStatusIcon(node.Status)}
- {node.Hostname}
-
- ))}
-
-
-
-
-
-
Node Status:
-
- {nodes.map((node) => (
-
-
- {getStatusIcon(node.Status)}
- {node.Hostname}
-
-
- {node.ManagerStatus || "Worker"}
-
-
- ))}
-
-
-
-
- {nodes.map((node) => (
-
-
- );
-}
+
+
+
+ Active Nodes
+
+ Online
+
+
+
+
+
+
+
+
+
+ {activeNodesCount} / {totalNodes}
+
+
+
+
+ {activeNodes.map((node) => (
+
+ {node.Hostname}
+
+ ))}
+
+
+
+
+
+
+
+
+
+ Manager Nodes
+
+ Online
+
+
+
+
+
+
+
+
+
+
+ {managerNodesCount} / {totalNodes}
+
+
+
+
+ {managerNodes.map((node) => (
+
+ {node.Hostname}
+
+ ))}
+
+
+
+
+
+
+
+
+ {nodes.map((node) => (
+
+
+
+ );
+}
\ No newline at end of file
diff --git a/apps/dokploy/lib/languages.ts b/apps/dokploy/lib/languages.ts
index af32858a..2530fe81 100644
--- a/apps/dokploy/lib/languages.ts
+++ b/apps/dokploy/lib/languages.ts
@@ -1,20 +1,21 @@
-export enum Languages {
- English = "en",
- Polish = "pl",
- Russian = "ru",
- French = "fr",
- German = "de",
- ChineseTraditional = "zh-Hant",
- ChineseSimplified = "zh-Hans",
- Turkish = "tr",
- Kazakh = "kz",
- Persian = "fa",
- Korean = "ko",
- Portuguese = "pt-br",
- Italian = "it",
- Japanese = "ja",
- Spanish = "es",
- Norwegian = "no",
-}
-
-export type Language = keyof typeof Languages;
+export const Languages = {
+ english: { code: "en", name: "English" },
+ polish: { code: "pl", name: "Polski" },
+ russian: { code: "ru", name: "Русский" },
+ french: { code: "fr", name: "Français" },
+ german: { code: "de", name: "Deutsch" },
+ chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
+ chineseSimplified: { code: "zh-Hans", name: "简体中文" },
+ turkish: { code: "tr", name: "Türkçe" },
+ kazakh: { code: "kz", name: "Қазақ" },
+ persian: { code: "fa", name: "فارسی" },
+ korean: { code: "ko", name: "한국어" },
+ portuguese: { code: "pt-br", name: "Português" },
+ italian: { code: "it", name: "Italiano" },
+ japanese: { code: "ja", name: "日本語" },
+ spanish: { code: "es", name: "Español" },
+ norwegian: { code: "no", name: "Norsk" },
+};
+
+export type Language = keyof typeof Languages;
+export type LanguageCode = (typeof Languages)[keyof typeof Languages]["code"];
diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
index fb7f012d..f7ec4566 100644
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -1,6 +1,6 @@
{
"name": "dokploy",
- "version": "v0.16.0",
+ "version": "v0.16.1",
"private": true,
"license": "Apache-2.0",
"type": "module",
diff --git a/apps/dokploy/pages/_app.tsx b/apps/dokploy/pages/_app.tsx
index b8891437..7a3ad327 100644
--- a/apps/dokploy/pages/_app.tsx
+++ b/apps/dokploy/pages/_app.tsx
@@ -68,7 +68,7 @@ export default api.withTRPC(
appWithTranslation(MyApp, {
i18n: {
defaultLocale: "en",
- locales: Object.values(Languages),
+ locales: Object.values(Languages).map(language => language.code),
localeDetection: false,
},
fallbackLng: "en",
diff --git a/apps/dokploy/pages/api/deploy/[refreshToken].ts b/apps/dokploy/pages/api/deploy/[refreshToken].ts
index bcedc370..b5fb2197 100644
--- a/apps/dokploy/pages/api/deploy/[refreshToken].ts
+++ b/apps/dokploy/pages/api/deploy/[refreshToken].ts
@@ -106,14 +106,14 @@ export default async function handler(
},
);
} catch (error) {
- res.status(400).json({ message: "Error To Deploy Application", error });
+ res.status(400).json({ message: "Error deploying Application", error });
return;
}
- res.status(200).json({ message: "App Deployed Succesfully" });
+ res.status(200).json({ message: "Application deployed successfully" });
} catch (error) {
console.log(error);
- res.status(400).json({ message: "Error To Deploy Application", error });
+ res.status(400).json({ message: "Error deploying Application", error });
}
}
diff --git a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
index 14a010f2..2f4caecd 100644
--- a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
+++ b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
@@ -82,13 +82,13 @@ export default async function handler(
},
);
} catch (error) {
- res.status(400).json({ message: "Error To Deploy Compose", error });
+ res.status(400).json({ message: "Error deploying Compose", error });
return;
}
- res.status(200).json({ message: "Compose Deployed Succesfully" });
+ res.status(200).json({ message: "Compose deployed successfully" });
} catch (error) {
console.log(error);
- res.status(400).json({ message: "Error To Deploy Compose", error });
+ res.status(400).json({ message: "Error deploying Compose", error });
}
}
diff --git a/apps/dokploy/pages/api/deploy/github.ts b/apps/dokploy/pages/api/deploy/github.ts
index 45923762..9cefe4cf 100644
--- a/apps/dokploy/pages/api/deploy/github.ts
+++ b/apps/dokploy/pages/api/deploy/github.ts
@@ -159,7 +159,7 @@ export default async function handler(
}
res.status(200).json({ message: `Deployed ${totalApps} apps` });
} catch (error) {
- res.status(400).json({ message: "Error To Deploy Application", error });
+ res.status(400).json({ message: "Error deploying Application", error });
}
} else if (req.headers["x-github-event"] === "pull_request") {
const prId = githubBody?.pull_request?.id;
diff --git a/apps/dokploy/pages/dashboard/project/[projectId].tsx b/apps/dokploy/pages/dashboard/project/[projectId].tsx
index 6dcc9b91..3c459679 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId].tsx
@@ -2,7 +2,7 @@ import { AddApplication } from "@/components/dashboard/project/add-application";
import { AddCompose } from "@/components/dashboard/project/add-compose";
import { AddDatabase } from "@/components/dashboard/project/add-database";
import { AddTemplate } from "@/components/dashboard/project/add-template";
-import { ProjectEnviroment } from "@/components/dashboard/projects/project-enviroment";
+import { ProjectEnvironment } from "@/components/dashboard/projects/project-environment";
import {
MariadbIcon,
MongodbIcon,
@@ -204,9 +204,9 @@ const Project = (
{(auth?.rol === "admin" || user?.canCreateServices) && (
-
- Project Enviroment
-
+
+ Project Environment
+
@@ -236,7 +236,7 @@ const Project = (
-
+
{emptyServices ? (
@@ -255,7 +255,7 @@ const Project = (
`/dashboard/project/${projectId}/services/${service.type}/${service.id}`,
);
}}
- className="group relative cursor-pointer bg-transparent transition-colors hover:bg-card h-fit"
+ className="flex flex-col group relative cursor-pointer bg-transparent transition-colors hover:bg-card"
>
-
+
Created
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
index 6b828dc7..e737cf2e 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
@@ -3,7 +3,7 @@ import { ShowVolumesCompose } from "@/components/dashboard/compose/advanced/show
import { DeleteCompose } from "@/components/dashboard/compose/delete-compose";
import { ShowDeploymentsCompose } from "@/components/dashboard/compose/deployments/show-deployments-compose";
import { ShowDomainsCompose } from "@/components/dashboard/compose/domains/show-domains";
-import { ShowEnvironmentCompose } from "@/components/dashboard/compose/enviroment/show";
+import { ShowEnvironmentCompose } from "@/components/dashboard/compose/environment/show";
import { ShowGeneralCompose } from "@/components/dashboard/compose/general/show";
import { ShowDockerLogsCompose } from "@/components/dashboard/compose/logs/show";
import { ShowDockerLogsStack } from "@/components/dashboard/compose/logs/show-stack";
diff --git a/apps/dokploy/pages/dashboard/settings/servers.tsx b/apps/dokploy/pages/dashboard/settings/servers.tsx
index 7aea531b..d25a3513 100644
--- a/apps/dokploy/pages/dashboard/settings/servers.tsx
+++ b/apps/dokploy/pages/dashboard/settings/servers.tsx
@@ -2,6 +2,7 @@ import { ShowServers } from "@/components/dashboard/settings/servers/show-server
import { DashboardLayout } from "@/components/layouts/dashboard-layout";
import { SettingsLayout } from "@/components/layouts/settings-layout";
import { appRouter } from "@/server/api/root";
+import { getLocale, serverSideTranslations } from "@/utils/i18n";
import { validateRequest } from "@dokploy/server";
import { createServerSideHelpers } from "@trpc/react-query/server";
import type { GetServerSidePropsContext } from "next";
@@ -29,6 +30,7 @@ export async function getServerSideProps(
ctx: GetServerSidePropsContext<{ serviceId: string }>,
) {
const { req, res } = ctx;
+ const locale = await getLocale(req.cookies);
const { user, session } = await validateRequest(req, res);
if (!user) {
return {
@@ -64,6 +66,7 @@ export async function getServerSideProps(
return {
props: {
trpcState: helpers.dehydrate(),
+ ...(await serverSideTranslations(locale, ["settings"])),
},
};
}
diff --git a/apps/dokploy/pages/dashboard/swarm.tsx b/apps/dokploy/pages/dashboard/swarm.tsx
index 15a7d793..f36de68e 100644
--- a/apps/dokploy/pages/dashboard/swarm.tsx
+++ b/apps/dokploy/pages/dashboard/swarm.tsx
@@ -10,9 +10,7 @@ import superjson from "superjson";
const Dashboard = () => {
return (
<>
-
-
+
- Registration succesfuly, Please check your inbox or spam
+ Registered successfully, please check your inbox or spam
folder to confirm your account.
diff --git a/apps/dokploy/pages/reset-password.tsx b/apps/dokploy/pages/reset-password.tsx
index 227a1d6b..9c598431 100644
--- a/apps/dokploy/pages/reset-password.tsx
+++ b/apps/dokploy/pages/reset-password.tsx
@@ -83,13 +83,13 @@ export default function Home({ token }: Props) {
password: values.password,
})
.then((data) => {
- toast.success("Password reset succesfully", {
+ toast.success("Password reset successfully", {
duration: 2000,
});
router.push("/");
})
.catch(() => {
- toast.error("Error to reset password", {
+ toast.error("Error resetting password", {
duration: 2000,
});
});
diff --git a/apps/dokploy/pages/send-reset-password.tsx b/apps/dokploy/pages/send-reset-password.tsx
index daac30e1..6a8eb5ab 100644
--- a/apps/dokploy/pages/send-reset-password.tsx
+++ b/apps/dokploy/pages/send-reset-password.tsx
@@ -76,7 +76,7 @@ export default function Home() {
});
})
.catch(() => {
- toast.error("Error to send email", {
+ toast.error("Error sending email", {
duration: 2000,
});
});
diff --git a/apps/dokploy/public/locales/en/settings.json b/apps/dokploy/public/locales/en/settings.json
index 6bfa4e3b..ebc5ea62 100644
--- a/apps/dokploy/public/locales/en/settings.json
+++ b/apps/dokploy/public/locales/en/settings.json
@@ -1,5 +1,6 @@
{
"settings.common.save": "Save",
+ "settings.common.enterTerminal": "Enter the terminal",
"settings.server.domain.title": "Server Domain",
"settings.server.domain.description": "Add a domain to your server application.",
"settings.server.domain.form.domain": "Domain",
@@ -48,5 +49,10 @@
"settings.appearance.themes.dark": "Dark",
"settings.appearance.themes.system": "System",
"settings.appearance.language": "Language",
- "settings.appearance.languageDescription": "Select a language for your dashboard"
+ "settings.appearance.languageDescription": "Select a language for your dashboard",
+
+ "settings.terminal.connectionSettings": "Connection settings",
+ "settings.terminal.ipAddress": "IP Address",
+ "settings.terminal.port": "Port",
+ "settings.terminal.username": "Username"
}
diff --git a/apps/dokploy/public/locales/pl/settings.json b/apps/dokploy/public/locales/pl/settings.json
index 48531e69..93414825 100644
--- a/apps/dokploy/public/locales/pl/settings.json
+++ b/apps/dokploy/public/locales/pl/settings.json
@@ -1,5 +1,6 @@
{
"settings.common.save": "Zapisz",
+ "settings.common.enterTerminal": "Otwórz terminal",
"settings.server.domain.title": "Domena",
"settings.server.domain.description": "Dodaj domenę do aplikacji",
"settings.server.domain.form.domain": "Domena",
@@ -40,5 +41,10 @@
"settings.appearance.themes.dark": "Ciemny",
"settings.appearance.themes.system": "System",
"settings.appearance.language": "Język",
- "settings.appearance.languageDescription": "Wybierz język swojego pulpitu"
+ "settings.appearance.languageDescription": "Wybierz język swojego pulpitu",
+
+ "settings.terminal.connectionSettings": "Ustawienia połączenia",
+ "settings.terminal.ipAddress": "Adres IP",
+ "settings.terminal.port": "Port",
+ "settings.terminal.username": "Nazwa użytkownika"
}
diff --git a/apps/dokploy/public/templates/unifi.webp b/apps/dokploy/public/templates/unifi.webp
new file mode 100644
index 00000000..ffe1f244
Binary files /dev/null and b/apps/dokploy/public/templates/unifi.webp differ
diff --git a/apps/dokploy/reset-password.ts b/apps/dokploy/reset-password.ts
index e13c348a..43b11fdf 100644
--- a/apps/dokploy/reset-password.ts
+++ b/apps/dokploy/reset-password.ts
@@ -21,6 +21,6 @@ import { generateRandomPassword } from "@dokploy/server";
process.exit(0);
} catch (error) {
- console.log("Error to reset password", error);
+ console.log("Error resetting password", error);
}
})();
diff --git a/apps/dokploy/server/api/routers/admin.ts b/apps/dokploy/server/api/routers/admin.ts
index 6029c713..696f3c79 100644
--- a/apps/dokploy/server/api/routers/admin.ts
+++ b/apps/dokploy/server/api/routers/admin.ts
@@ -49,7 +49,7 @@ export const adminRouter = createTRPCRouter({
throw new TRPCError({
code: "BAD_REQUEST",
message:
- "Error to create this user\ncheck if the email is not registered",
+ "Error creating this user\ncheck if the email is not registered",
cause: error,
});
}
@@ -70,7 +70,7 @@ export const adminRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to delete this user",
+ message: "Error deleting this user",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/application.ts b/apps/dokploy/server/api/routers/application.ts
index b03211c4..13b7c80d 100644
--- a/apps/dokploy/server/api/routers/application.ts
+++ b/apps/dokploy/server/api/routers/application.ts
@@ -90,7 +90,7 @@ export const applicationRouter = createTRPCRouter({
}
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the application",
+ message: "Error creating the application",
cause: error,
});
}
@@ -441,7 +441,7 @@ export const applicationRouter = createTRPCRouter({
if (!updateApp) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update application",
+ message: "Error updating application",
});
}
diff --git a/apps/dokploy/server/api/routers/auth.ts b/apps/dokploy/server/api/routers/auth.ts
index b02ab617..f8bbfa9b 100644
--- a/apps/dokploy/server/api/routers/auth.ts
+++ b/apps/dokploy/server/api/routers/auth.ts
@@ -79,7 +79,7 @@ export const authRouter = createTRPCRouter({
throw new TRPCError({
code: "BAD_REQUEST",
// @ts-ignore
- message: `Error: ${error?.code === "23505" ? "Email already exists" : "Error to create admin"}`,
+ message: `Error: ${error?.code === "23505" ? "Email already exists" : "Error creating admin"}`,
cause: error,
});
}
@@ -111,7 +111,7 @@ export const authRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the user",
+ message: "Error creating the user",
cause: error,
});
}
@@ -162,7 +162,7 @@ export const authRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: `Error: ${error instanceof Error ? error.message : "Error to login"}`,
+ message: `Error: ${error instanceof Error ? error.message : "Login error"}`,
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/backup.ts b/apps/dokploy/server/api/routers/backup.ts
index c6ae38b6..0b8d7ab1 100644
--- a/apps/dokploy/server/api/routers/backup.ts
+++ b/apps/dokploy/server/api/routers/backup.ts
@@ -69,7 +69,7 @@ export const backupRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the Backup",
+ message: "Error creating the Backup",
cause: error,
});
}
@@ -113,7 +113,7 @@ export const backupRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update this Backup",
+ message: "Error updating this Backup",
});
}
}),
@@ -135,7 +135,7 @@ export const backupRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to delete this Backup",
+ message: "Error deleting this Backup",
cause: error,
});
}
@@ -152,7 +152,7 @@ export const backupRouter = createTRPCRouter({
console.log(error);
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to run manual postgres backup ",
+ message: "Error running manual Postgres backup ",
cause: error,
});
}
@@ -169,7 +169,7 @@ export const backupRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to run manual mysql backup ",
+ message: "Error running manual MySQL backup ",
cause: error,
});
}
@@ -185,7 +185,7 @@ export const backupRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to run manual mariadb backup ",
+ message: "Error running manual Mariadb backup ",
cause: error,
});
}
@@ -201,7 +201,7 @@ export const backupRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to run manual mongo backup ",
+ message: "Error running manual Mongo backup ",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/bitbucket.ts b/apps/dokploy/server/api/routers/bitbucket.ts
index 48b7fdd4..c66716d3 100644
--- a/apps/dokploy/server/api/routers/bitbucket.ts
+++ b/apps/dokploy/server/api/routers/bitbucket.ts
@@ -27,7 +27,7 @@ export const bitbucketRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create this bitbucket provider",
+ message: "Error creating this Bitbucket provider",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/cluster.ts b/apps/dokploy/server/api/routers/cluster.ts
index e42d4b04..7ded632c 100644
--- a/apps/dokploy/server/api/routers/cluster.ts
+++ b/apps/dokploy/server/api/routers/cluster.ts
@@ -35,7 +35,7 @@ export const clusterRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "INTERNAL_SERVER_ERROR",
- message: "Error to remove the node",
+ message: "Error removing the node",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts
index 5f53752b..dab37e78 100644
--- a/apps/dokploy/server/api/routers/compose.ts
+++ b/apps/dokploy/server/api/routers/compose.ts
@@ -198,7 +198,7 @@ export const composeRouter = createTRPCRouter({
} catch (err) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to fetch source type",
+ message: "Error fetching source type",
cause: err,
});
}
diff --git a/apps/dokploy/server/api/routers/destination.ts b/apps/dokploy/server/api/routers/destination.ts
index 6374ec45..d13928be 100644
--- a/apps/dokploy/server/api/routers/destination.ts
+++ b/apps/dokploy/server/api/routers/destination.ts
@@ -32,7 +32,7 @@ export const destinationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the destination",
+ message: "Error creating the destination",
cause: error,
});
}
@@ -75,7 +75,7 @@ export const destinationRouter = createTRPCRouter({
message:
error instanceof Error
? error?.message
- : "Error to connect to bucket",
+ : "Error connecting to bucket",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/domain.ts b/apps/dokploy/server/api/routers/domain.ts
index b0a1000c..f122cf86 100644
--- a/apps/dokploy/server/api/routers/domain.ts
+++ b/apps/dokploy/server/api/routers/domain.ts
@@ -49,7 +49,7 @@ export const domainRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the domain",
+ message: "Error creating the domain",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/git-provider.ts b/apps/dokploy/server/api/routers/git-provider.ts
index e1e8ef8b..abd93392 100644
--- a/apps/dokploy/server/api/routers/git-provider.ts
+++ b/apps/dokploy/server/api/routers/git-provider.ts
@@ -32,14 +32,14 @@ export const gitProviderRouter = createTRPCRouter({
// TODO: Remove isCloud in the next versions of dokploy
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to delete this git provider",
+ message: "You are not allowed to delete this Git provider",
});
}
return await removeGitProvider(input.gitProviderId);
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to delete this git provider",
+ message: "Error deleting this Git provider",
});
}
}),
diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts
index c057061f..6d35f4a2 100644
--- a/apps/dokploy/server/api/routers/gitlab.ts
+++ b/apps/dokploy/server/api/routers/gitlab.ts
@@ -30,7 +30,7 @@ export const gitlabRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create this gitlab provider",
+ message: "Error creating this Gitlab provider",
cause: error,
});
}
@@ -43,7 +43,7 @@ export const gitlabRouter = createTRPCRouter({
//TODO: Remove this line when the cloud version is ready
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to access this gitlab provider",
+ message: "You are not allowed to access this Gitlab provider",
});
}
return gitlabProvider;
@@ -82,7 +82,7 @@ export const gitlabRouter = createTRPCRouter({
//TODO: Remove this line when the cloud version is ready
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to access this gitlab provider",
+ message: "You are not allowed to access this Gitlab provider",
});
}
return await getGitlabRepositories(input.gitlabId);
@@ -96,7 +96,7 @@ export const gitlabRouter = createTRPCRouter({
//TODO: Remove this line when the cloud version is ready
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to access this gitlab provider",
+ message: "You are not allowed to access this Gitlab provider",
});
}
return await getGitlabBranches(input);
@@ -113,7 +113,7 @@ export const gitlabRouter = createTRPCRouter({
//TODO: Remove this line when the cloud version is ready
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to access this gitlab provider",
+ message: "You are not allowed to access this Gitlab provider",
});
}
const result = await testGitlabConnection(input);
@@ -134,7 +134,7 @@ export const gitlabRouter = createTRPCRouter({
//TODO: Remove this line when the cloud version is ready
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to access this gitlab provider",
+ message: "You are not allowed to access this Gitlab provider",
});
}
if (input.name) {
diff --git a/apps/dokploy/server/api/routers/mariadb.ts b/apps/dokploy/server/api/routers/mariadb.ts
index 6755d647..51b4b876 100644
--- a/apps/dokploy/server/api/routers/mariadb.ts
+++ b/apps/dokploy/server/api/routers/mariadb.ts
@@ -41,7 +41,7 @@ export const mariadbRouter = createTRPCRouter({
if (IS_CLOUD && !input.serverId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You need to use a server to create a mariadb",
+ message: "You need to use a server to create a Mariadb",
});
}
@@ -83,7 +83,7 @@ export const mariadbRouter = createTRPCRouter({
if (mariadb.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to access this mariadb",
+ message: "You are not authorized to access this Mariadb",
});
}
return mariadb;
@@ -96,7 +96,7 @@ export const mariadbRouter = createTRPCRouter({
if (service.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to start this mariadb",
+ message: "You are not authorized to start this Mariadb",
});
}
if (service.serverId) {
@@ -149,7 +149,7 @@ export const mariadbRouter = createTRPCRouter({
if (mariadb.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to deploy this mariadb",
+ message: "You are not authorized to deploy this Mariadb",
});
}
@@ -162,7 +162,7 @@ export const mariadbRouter = createTRPCRouter({
if (mongo.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to change this mariadb status",
+ message: "You are not authorized to change this Mariadb status",
});
}
await updateMariadbById(input.mariadbId, {
@@ -181,7 +181,7 @@ export const mariadbRouter = createTRPCRouter({
if (mongo.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to delete this mariadb",
+ message: "You are not authorized to delete this Mariadb",
});
}
@@ -215,7 +215,7 @@ export const mariadbRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to add environment variables",
+ message: "Error adding environment variables",
});
}
@@ -228,7 +228,7 @@ export const mariadbRouter = createTRPCRouter({
if (mariadb.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to reload this mariadb",
+ message: "You are not authorized to reload this Mariadb",
});
}
if (mariadb.serverId) {
@@ -258,7 +258,7 @@ export const mariadbRouter = createTRPCRouter({
if (mariadb.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to update this mariadb",
+ message: "You are not authorized to update this Mariadb",
});
}
const service = await updateMariadbById(mariadbId, {
@@ -268,7 +268,7 @@ export const mariadbRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update mariadb",
+ message: "Update: Error updating Mariadb",
});
}
diff --git a/apps/dokploy/server/api/routers/mongo.ts b/apps/dokploy/server/api/routers/mongo.ts
index 49dc5ec2..f6305835 100644
--- a/apps/dokploy/server/api/routers/mongo.ts
+++ b/apps/dokploy/server/api/routers/mongo.ts
@@ -257,7 +257,7 @@ export const mongoRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to add environment variables",
+ message: "Error adding environment variables",
});
}
@@ -281,7 +281,7 @@ export const mongoRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update mongo",
+ message: "Update: Error updating Mongo",
});
}
diff --git a/apps/dokploy/server/api/routers/mysql.ts b/apps/dokploy/server/api/routers/mysql.ts
index 893adb9c..94bc0ace 100644
--- a/apps/dokploy/server/api/routers/mysql.ts
+++ b/apps/dokploy/server/api/routers/mysql.ts
@@ -42,7 +42,7 @@ export const mysqlRouter = createTRPCRouter({
if (IS_CLOUD && !input.serverId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You need to use a server to create a mysql",
+ message: "You need to use a server to create a MySQL",
});
}
1;
@@ -74,7 +74,7 @@ export const mysqlRouter = createTRPCRouter({
}
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error input: Inserting mysql database",
+ message: "Error input: Inserting MySQL database",
cause: error,
});
}
@@ -89,7 +89,7 @@ export const mysqlRouter = createTRPCRouter({
if (mysql.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to access this mysql",
+ message: "You are not authorized to access this MySQL",
});
}
return mysql;
@@ -102,7 +102,7 @@ export const mysqlRouter = createTRPCRouter({
if (service.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to start this mysql",
+ message: "You are not authorized to start this MySQL",
});
}
@@ -124,7 +124,7 @@ export const mysqlRouter = createTRPCRouter({
if (mongo.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to stop this mysql",
+ message: "You are not authorized to stop this MySQL",
});
}
if (mongo.serverId) {
@@ -161,7 +161,7 @@ export const mysqlRouter = createTRPCRouter({
if (mysql.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to deploy this mysql",
+ message: "You are not authorized to deploy this MySQL",
});
}
return deployMySql(input.mysqlId);
@@ -173,7 +173,7 @@ export const mysqlRouter = createTRPCRouter({
if (mongo.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to change this mysql status",
+ message: "You are not authorized to change this MySQL status",
});
}
await updateMySqlById(input.mysqlId, {
@@ -188,7 +188,7 @@ export const mysqlRouter = createTRPCRouter({
if (mysql.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to reload this mysql",
+ message: "You are not authorized to reload this MySQL",
});
}
if (mysql.serverId) {
@@ -219,7 +219,7 @@ export const mysqlRouter = createTRPCRouter({
if (mongo.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to delete this mysql",
+ message: "You are not authorized to delete this MySQL",
});
}
@@ -253,7 +253,7 @@ export const mysqlRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to add environment variables",
+ message: "Error adding environment variables",
});
}
@@ -267,7 +267,7 @@ export const mysqlRouter = createTRPCRouter({
if (mysql.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to update this mysql",
+ message: "You are not authorized to update this MySQL",
});
}
const service = await updateMySqlById(mysqlId, {
@@ -277,7 +277,7 @@ export const mysqlRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update mysql",
+ message: "Update: Error updating MySQL",
});
}
diff --git a/apps/dokploy/server/api/routers/notification.ts b/apps/dokploy/server/api/routers/notification.ts
index ba226d45..f8869503 100644
--- a/apps/dokploy/server/api/routers/notification.ts
+++ b/apps/dokploy/server/api/routers/notification.ts
@@ -50,7 +50,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the notification",
+ message: "Error creating the notification",
cause: error,
});
}
@@ -87,7 +87,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to test the notification",
+ message: "Error testing the notification",
cause: error,
});
}
@@ -100,7 +100,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the notification",
+ message: "Error creating the notification",
cause: error,
});
}
@@ -125,7 +125,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update the notification",
+ message: "Error updating the notification",
cause: error,
});
}
@@ -139,7 +139,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to test the notification",
+ message: "Error testing the notification",
cause: error,
});
}
@@ -152,7 +152,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the notification",
+ message: "Error creating the notification",
cause: error,
});
}
@@ -177,7 +177,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update the notification",
+ message: "Error updating the notification",
cause: error,
});
}
@@ -200,7 +200,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to test the notification",
+ message: "Error testing the notification",
cause: error,
});
}
@@ -213,7 +213,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the notification",
+ message: "Error creating the notification",
cause: error,
});
}
@@ -237,7 +237,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update the notification",
+ message: "Error updating the notification",
cause: error,
});
}
@@ -255,7 +255,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to test the notification",
+ message: "Error testing the notification",
cause: error,
});
}
@@ -276,7 +276,7 @@ export const notificationRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to delete this notification",
+ message: "Error deleting this notification",
});
}
}),
diff --git a/apps/dokploy/server/api/routers/port.ts b/apps/dokploy/server/api/routers/port.ts
index 409eb8f0..bfbc9863 100644
--- a/apps/dokploy/server/api/routers/port.ts
+++ b/apps/dokploy/server/api/routers/port.ts
@@ -58,7 +58,7 @@ export const portRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to updating port",
+ message: "Error updating the port",
});
}
}),
diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts
index 14f9d967..4afacd71 100644
--- a/apps/dokploy/server/api/routers/postgres.ts
+++ b/apps/dokploy/server/api/routers/postgres.ts
@@ -40,7 +40,7 @@ export const postgresRouter = createTRPCRouter({
if (IS_CLOUD && !input.serverId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You need to use a server to create a postgres",
+ message: "You need to use a server to create a Postgres",
});
}
@@ -71,7 +71,7 @@ export const postgresRouter = createTRPCRouter({
}
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error input: Inserting postgresql database",
+ message: "Error input: Inserting Postgres database",
cause: error,
});
}
@@ -87,7 +87,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to access this postgres",
+ message: "You are not authorized to access this Postgres",
});
}
return postgres;
@@ -101,7 +101,7 @@ export const postgresRouter = createTRPCRouter({
if (service.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to start this postgres",
+ message: "You are not authorized to start this Postgres",
});
}
@@ -123,7 +123,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to stop this postgres",
+ message: "You are not authorized to stop this Postgres",
});
}
if (postgres.serverId) {
@@ -161,7 +161,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to deploy this postgres",
+ message: "You are not authorized to deploy this Postgres",
});
}
return deployPostgres(input.postgresId);
@@ -173,7 +173,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to change this postgres status",
+ message: "You are not authorized to change this Postgres status",
});
}
await updatePostgresById(input.postgresId, {
@@ -192,7 +192,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to delete this postgres",
+ message: "You are not authorized to delete this Postgres",
});
}
@@ -222,7 +222,7 @@ export const postgresRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to add environment variables",
+ message: "Error adding environment variables",
});
}
@@ -235,7 +235,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to reload this postgres",
+ message: "You are not authorized to reload this Postgres",
});
}
if (postgres.serverId) {
@@ -265,7 +265,7 @@ export const postgresRouter = createTRPCRouter({
if (postgres.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to update this postgres",
+ message: "You are not authorized to update this Postgres",
});
}
const service = await updatePostgresById(postgresId, {
@@ -275,7 +275,7 @@ export const postgresRouter = createTRPCRouter({
if (!service) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update postgres",
+ message: "Error updating Postgres",
});
}
diff --git a/apps/dokploy/server/api/routers/project.ts b/apps/dokploy/server/api/routers/project.ts
index 81b60004..967b39e3 100644
--- a/apps/dokploy/server/api/routers/project.ts
+++ b/apps/dokploy/server/api/routers/project.ts
@@ -58,7 +58,7 @@ export const projectRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: `Error to create the project: ${error instanceof Error ? error.message : error}`,
+ message: `Error creating the project: ${error instanceof Error ? error.message : error}`,
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/redis.ts b/apps/dokploy/server/api/routers/redis.ts
index fdd2db9c..672b550e 100644
--- a/apps/dokploy/server/api/routers/redis.ts
+++ b/apps/dokploy/server/api/routers/redis.ts
@@ -42,7 +42,7 @@ export const redisRouter = createTRPCRouter({
if (IS_CLOUD && !input.serverId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You need to use a server to create a redis",
+ message: "You need to use a server to create a Redis",
});
}
@@ -82,7 +82,7 @@ export const redisRouter = createTRPCRouter({
if (redis.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to access this redis",
+ message: "You are not authorized to access this Redis",
});
}
return redis;
@@ -95,7 +95,7 @@ export const redisRouter = createTRPCRouter({
if (redis.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to start this redis",
+ message: "You are not authorized to start this Redis",
});
}
@@ -117,7 +117,7 @@ export const redisRouter = createTRPCRouter({
if (redis.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to reload this redis",
+ message: "You are not authorized to reload this Redis",
});
}
if (redis.serverId) {
@@ -147,7 +147,7 @@ export const redisRouter = createTRPCRouter({
if (redis.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to stop this redis",
+ message: "You are not authorized to stop this Redis",
});
}
if (redis.serverId) {
@@ -184,7 +184,7 @@ export const redisRouter = createTRPCRouter({
if (redis.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to deploy this redis",
+ message: "You are not authorized to deploy this Redis",
});
}
return deployRedis(input.redisId);
@@ -196,7 +196,7 @@ export const redisRouter = createTRPCRouter({
if (mongo.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to change this redis status",
+ message: "You are not authorized to change this Redis status",
});
}
await updateRedisById(input.redisId, {
@@ -216,7 +216,7 @@ export const redisRouter = createTRPCRouter({
if (redis.project.adminId !== ctx.user.adminId) {
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not authorized to delete this redis",
+ message: "You are not authorized to delete this Redis",
});
}
@@ -250,7 +250,7 @@ export const redisRouter = createTRPCRouter({
if (!updatedRedis) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to add environment variables",
+ message: "Error adding environment variables",
});
}
@@ -267,7 +267,7 @@ export const redisRouter = createTRPCRouter({
if (!redis) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update redis",
+ message: "Error updating Redis",
});
}
diff --git a/apps/dokploy/server/api/routers/registry.ts b/apps/dokploy/server/api/routers/registry.ts
index 8ca4a8a0..2cadce71 100644
--- a/apps/dokploy/server/api/routers/registry.ts
+++ b/apps/dokploy/server/api/routers/registry.ts
@@ -54,7 +54,7 @@ export const registryRouter = createTRPCRouter({
if (!application) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Update: Error to update registry",
+ message: "Error updating registry",
});
}
diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts
index 4076d6e9..d01e4638 100644
--- a/apps/dokploy/server/api/routers/server.ts
+++ b/apps/dokploy/server/api/routers/server.ts
@@ -52,7 +52,7 @@ export const serverRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the server",
+ message: "Error creating the server",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/settings.ts b/apps/dokploy/server/api/routers/settings.ts
index 8bec9b52..b40ee95b 100644
--- a/apps/dokploy/server/api/routers/settings.ts
+++ b/apps/dokploy/server/api/routers/settings.ts
@@ -748,7 +748,7 @@ export const settingsRouter = createTRPCRouter({
message:
error instanceof Error
? error.message
- : "Error to update Traefik ports",
+ : "Error updating Traefik ports",
cause: error,
});
}
diff --git a/apps/dokploy/server/api/routers/ssh-key.ts b/apps/dokploy/server/api/routers/ssh-key.ts
index ceb32993..fe2f24f9 100644
--- a/apps/dokploy/server/api/routers/ssh-key.ts
+++ b/apps/dokploy/server/api/routers/ssh-key.ts
@@ -31,7 +31,7 @@ export const sshRouter = createTRPCRouter({
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the ssh key",
+ message: "Error creating the SSH key",
cause: error,
});
}
@@ -45,7 +45,7 @@ export const sshRouter = createTRPCRouter({
// TODO: Remove isCloud in the next versions of dokploy
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to delete this ssh key",
+ message: "You are not allowed to delete this SSH key",
});
}
@@ -63,7 +63,7 @@ export const sshRouter = createTRPCRouter({
// TODO: Remove isCloud in the next versions of dokploy
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to access this ssh key",
+ message: "You are not allowed to access this SSH key",
});
}
return sshKey;
@@ -89,14 +89,14 @@ export const sshRouter = createTRPCRouter({
// TODO: Remove isCloud in the next versions of dokploy
throw new TRPCError({
code: "UNAUTHORIZED",
- message: "You are not allowed to update this ssh key",
+ message: "You are not allowed to update this SSH key",
});
}
return await updateSSHKeyById(input);
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update this ssh key",
+ message: "Error updating this SSH key",
cause: error,
});
}
diff --git a/apps/dokploy/server/db/reset.ts b/apps/dokploy/server/db/reset.ts
index 7497bec3..c2229147 100644
--- a/apps/dokploy/server/db/reset.ts
+++ b/apps/dokploy/server/db/reset.ts
@@ -15,7 +15,7 @@ const clearDb = async (): Promise => {
console.log(tables);
await pg.end();
} catch (error) {
- console.error("Error to clean database", error);
+ console.error("Error cleaning database", error);
} finally {
}
};
diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts
index b1ecb908..8c661c8a 100644
--- a/apps/dokploy/server/wss/terminal.ts
+++ b/apps/dokploy/server/wss/terminal.ts
@@ -1,8 +1,13 @@
import type http from "node:http";
-import { findServerById, validateWebSocketRequest } from "@dokploy/server";
+import {
+ findServerById,
+ IS_CLOUD,
+ validateWebSocketRequest,
+} from "@dokploy/server";
import { publicIpv4, publicIpv6 } from "public-ip";
-import { Client } from "ssh2";
+import { Client, type ConnectConfig } from "ssh2";
import { WebSocketServer } from "ws";
+import { setupLocalServerSSHKey } from "./utils";
export const getPublicIpWithFallback = async () => {
// @ts-ignore
@@ -55,21 +60,66 @@ export const setupTerminalWebSocketServer = (
return;
}
- const server = await findServerById(serverId);
+ let connectionDetails: ConnectConfig = {};
- if (!server) {
- ws.close();
- return;
+ const isLocalServer = serverId === "local";
+
+ if (isLocalServer && !IS_CLOUD) {
+ const port = Number(url.searchParams.get("port"));
+ const username = url.searchParams.get("username");
+
+ if (!port || !username) {
+ ws.close();
+ return;
+ }
+
+ ws.send("Setting up private SSH key...\n");
+ const privateKey = await setupLocalServerSSHKey();
+
+ if (!privateKey) {
+ ws.close();
+ return;
+ }
+
+ connectionDetails = {
+ host: "localhost",
+ port,
+ username,
+ privateKey,
+ };
+ } else {
+ const server = await findServerById(serverId);
+
+ if (!server) {
+ ws.close();
+ return;
+ }
+
+ const { ipAddress: host, port, username, sshKey, sshKeyId } = server;
+
+ if (!sshKeyId) {
+ throw new Error("No SSH key available for this server");
+ }
+
+ connectionDetails = {
+ host,
+ port,
+ username,
+ privateKey: sshKey?.privateKey,
+ };
}
- if (!server.sshKeyId)
- throw new Error("No SSH key available for this server");
-
const conn = new Client();
let stdout = "";
let stderr = "";
+
+ ws.send("Connecting...\n");
+
conn
.once("ready", () => {
+ // Clear terminal content once connected
+ ws.send("\x1bc");
+
conn.shell({}, (err, stream) => {
if (err) throw err;
@@ -112,18 +162,13 @@ export const setupTerminalWebSocketServer = (
.on("error", (err) => {
if (err.level === "client-authentication") {
ws.send(
- `Authentication failed: Invalid SSH private key. ❌ Error: ${err.message} ${err.level}`,
+ `Authentication failed: Unauthorized ${isLocalServer ? "" : "private SSH key or "}username.\n❌ Error: ${err.message} ${err.level}`,
);
} else {
- ws.send(`SSH connection error: ${err.message}`);
+ ws.send(`SSH connection error: ${err.message} ❌ `);
}
conn.end();
})
- .connect({
- host: server.ipAddress,
- port: server.port,
- username: server.username,
- privateKey: server.sshKey?.privateKey,
- });
+ .connect(connectionDetails);
});
};
diff --git a/apps/dokploy/server/wss/utils.ts b/apps/dokploy/server/wss/utils.ts
index b5567127..9c78869d 100644
--- a/apps/dokploy/server/wss/utils.ts
+++ b/apps/dokploy/server/wss/utils.ts
@@ -1,4 +1,17 @@
+import { execAsync } from "@dokploy/server";
import os from "node:os";
+import path from "node:path";
+import fs from "node:fs";
+
+const HOME_PATH = process.env.HOME || process.env.USERPROFILE || "/";
+
+const LOCAL_SSH_KEY_PATH = path.join(
+ HOME_PATH,
+ ".ssh",
+ "auto_generated-dokploy-local",
+);
+
+const AUTHORIZED_KEYS_PATH = path.join(HOME_PATH, ".ssh", "authorized_keys");
export const getShell = () => {
switch (os.platform()) {
@@ -10,3 +23,40 @@ export const getShell = () => {
return "bash";
}
};
+
+/** Returns private SSH key for dokploy local server terminal. Uses already created SSH key or generates a new SSH key, also automatically appends the public key to `authorized_keys`, creating the file if needed. */
+export const setupLocalServerSSHKey = async () => {
+ try {
+ if (!fs.existsSync(LOCAL_SSH_KEY_PATH)) {
+ // Generate new SSH key if it hasn't been created yet
+ await execAsync(
+ `ssh-keygen -t rsa -b 4096 -f ${LOCAL_SSH_KEY_PATH} -N ""`,
+ );
+ }
+
+ const privateKey = fs.readFileSync(LOCAL_SSH_KEY_PATH, "utf8");
+ const publicKey = fs.readFileSync(`${LOCAL_SSH_KEY_PATH}.pub`, "utf8");
+ const authKeyContent = `${publicKey}\n`;
+
+ if (!fs.existsSync(AUTHORIZED_KEYS_PATH)) {
+ // Create authorized_keys if it doesn't exist yet
+ fs.writeFileSync(AUTHORIZED_KEYS_PATH, authKeyContent, { mode: 0o600 });
+ return privateKey;
+ }
+
+ const existingAuthKeys = fs.readFileSync(AUTHORIZED_KEYS_PATH, "utf8");
+ if (existingAuthKeys.includes(publicKey)) {
+ return privateKey;
+ }
+
+ // Append the public key to authorized_keys
+ fs.appendFileSync(AUTHORIZED_KEYS_PATH, authKeyContent, {
+ mode: 0o600,
+ });
+
+ return privateKey;
+ } catch (error) {
+ console.error("Error getting private SSH key for local terminal:", error);
+ return "";
+ }
+};
diff --git a/apps/dokploy/setup.ts b/apps/dokploy/setup.ts
index e4192ada..5e15db07 100644
--- a/apps/dokploy/setup.ts
+++ b/apps/dokploy/setup.ts
@@ -24,6 +24,6 @@ import {
await initializeRedis();
await initializePostgres();
} catch (e) {
- console.error("Error to setup dokploy", e);
+ console.error("Error in dokploy setup", e);
}
})();
diff --git a/apps/dokploy/styles/globals.css b/apps/dokploy/styles/globals.css
index ab6084e1..5550358e 100644
--- a/apps/dokploy/styles/globals.css
+++ b/apps/dokploy/styles/globals.css
@@ -90,6 +90,10 @@
}
}
+html {
+ scrollbar-gutter: stable both-edges;
+}
+
.xterm-viewport {
border-radius: 0.75rem /* 12px */ !important;
}
diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts
index 917184c5..48840a32 100644
--- a/apps/dokploy/templates/templates.ts
+++ b/apps/dokploy/templates/templates.ts
@@ -1151,4 +1151,19 @@ export const templates: TemplateData[] = [
tags: ["self-hosted", "development"],
load: () => import("./onedev/index").then((m) => m.generate),
},
+ {
+ id: "unifi",
+ name: "Unifi Network",
+ version: "11.6.6",
+ description:
+ "Unifi Network is an open-source enterprise network management platform for wireless networks.",
+ logo: "unifi.webp",
+ links: {
+ github: "https://github.com/ubiquiti",
+ website: "https://www.ui.com/",
+ docs: "https://help.ui.com/hc/en-us/articles/360012282453-Self-Hosting-a-UniFi-Network-Server",
+ },
+ tags: ["self-hosted", "networking"],
+ load: () => import("./unifi/index").then((m) => m.generate),
+ },
];
diff --git a/apps/dokploy/templates/unifi/docker-compose.yml b/apps/dokploy/templates/unifi/docker-compose.yml
new file mode 100644
index 00000000..ee531f67
--- /dev/null
+++ b/apps/dokploy/templates/unifi/docker-compose.yml
@@ -0,0 +1,48 @@
+services:
+ unifi-network-application:
+ image: lscr.io/linuxserver/unifi-network-application:latest
+ environment:
+ - PUID=1000 # User ID
+ - PGID=1000 # Group ID
+ - TZ=Etc/UTC # Timezone
+ - MONGO_HOST=unifi-db
+ - MONGO_USER=unifi
+ - MONGO_PASS=unifi_password
+ - MONGO_PORT=27017
+ - MONGO_DBNAME=unifi
+ - MEM_LIMIT=1024
+ - MEM_STARTUP=1024
+ - MONGO_TLS= #optional # MongoDB TLS setting
+ - MONGO_AUTHSOURCE= #optional # MongoDB authentication source
+ volumes: # Volumes to mount in the container
+ - ../files/config:/config # Map host directory to container directory
+ ports:
+ - 8443:8443 # HTTPS portal
+ # - 3478:3478/udp # STUN service
+ # - 10001:10001/udp # UniFi AP discovery
+ # - 8080:8080 # HTTP portal
+ # - 1900:1900/udp #optional # For DLNA
+ # - 8843:8843 #optional # HTTPS guest portal
+ # - 8880:8880 #optional # HTTP guest portal
+ # - 6789:6789 #optional # Mobile speed test port
+ # - 5514:5514/udp #optional # Remote syslog port
+ restart: unless-stopped
+ depends_on:
+ - unifi-db
+ networks:
+ - dokploy-network
+
+ unifi-db:
+ image: mongo:4.4
+ volumes:
+ - ../files/db/data:/data/db
+ - ../files/init-mongo.sh:/docker-entrypoint-initdb.d/init-mongo.sh:ro
+ ports:
+ - 27017
+ restart: unless-stopped
+ networks:
+ - dokploy-network
+
+networks:
+ dokploy-network:
+ external: true
diff --git a/apps/dokploy/templates/unifi/index.ts b/apps/dokploy/templates/unifi/index.ts
new file mode 100644
index 00000000..975ce63d
--- /dev/null
+++ b/apps/dokploy/templates/unifi/index.ts
@@ -0,0 +1,27 @@
+import type { Schema, Template } from "../utils";
+
+export function generate(schema: Schema): Template {
+ const mounts: Template["mounts"] = [
+ {
+ filePath: "init-mongo.sh",
+ content: `
+ #!/bin/bash
+ mongo < {
+ const setLocale = (locale: LanguageCode) => {
Cookies.set("DOKPLOY_LOCALE", locale, { expires: 365 });
window.location.reload();
};
diff --git a/apps/dokploy/utils/i18n.ts b/apps/dokploy/utils/i18n.ts
index 47466d1f..171bf892 100644
--- a/apps/dokploy/utils/i18n.ts
+++ b/apps/dokploy/utils/i18n.ts
@@ -17,7 +17,7 @@ export const serverSideTranslations = (
keySeparator: false,
i18n: {
defaultLocale: "en",
- locales: Object.values(Languages),
+ locales: Object.values(Languages).map(language => language.code),
localeDetection: false,
},
});
diff --git a/packages/server/src/db/reset.ts b/packages/server/src/db/reset.ts
index 7497bec3..c2229147 100644
--- a/packages/server/src/db/reset.ts
+++ b/packages/server/src/db/reset.ts
@@ -15,7 +15,7 @@ const clearDb = async (): Promise => {
console.log(tables);
await pg.end();
} catch (error) {
- console.error("Error to clean database", error);
+ console.error("Error cleaning database", error);
} finally {
}
};
diff --git a/packages/server/src/db/schema/destination.ts b/packages/server/src/db/schema/destination.ts
index 320a3d7c..7d7be614 100644
--- a/packages/server/src/db/schema/destination.ts
+++ b/packages/server/src/db/schema/destination.ts
@@ -82,6 +82,7 @@ export const apiUpdateDestination = createSchema
endpoint: true,
secretAccessKey: true,
destinationId: true,
+ provider: true,
})
.required()
.extend({
diff --git a/packages/server/src/services/admin.ts b/packages/server/src/services/admin.ts
index 2e7c5735..3502395e 100644
--- a/packages/server/src/services/admin.ts
+++ b/packages/server/src/services/admin.ts
@@ -30,7 +30,7 @@ export const createInvitation = async (
if (!result) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the user",
+ message: "Error creating the user",
});
}
const expiresIn24Hours = new Date();
diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts
index b8ecb88b..e2ed407f 100644
--- a/packages/server/src/services/application.ts
+++ b/packages/server/src/services/application.ts
@@ -86,7 +86,7 @@ export const createApplication = async (
if (!newApplication) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the application",
+ message: "Error creating the application",
});
}
@@ -222,7 +222,7 @@ export const deployApplication = async ({
applicationName: application.name,
applicationType: "application",
// @ts-ignore
- errorMessage: error?.message || "Error to build",
+ errorMessage: error?.message || "Error building",
buildLink,
adminId: application.project.adminId,
});
@@ -352,7 +352,7 @@ export const deployRemoteApplication = async ({
applicationName: application.name,
applicationType: "application",
// @ts-ignore
- errorMessage: error?.message || "Error to build",
+ errorMessage: error?.message || "Error building",
buildLink,
adminId: application.project.adminId,
});
diff --git a/packages/server/src/services/auth.ts b/packages/server/src/services/auth.ts
index 598e39e3..65a01c41 100644
--- a/packages/server/src/services/auth.ts
+++ b/packages/server/src/services/auth.ts
@@ -34,7 +34,7 @@ export const createAdmin = async (input: typeof apiCreateAdmin._type) => {
if (!newAuth) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the user",
+ message: "Error creating the user",
});
}
@@ -68,7 +68,7 @@ export const createUser = async (input: typeof apiCreateUser._type) => {
if (!res) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the user",
+ message: "Error creating the user",
});
}
diff --git a/packages/server/src/services/backup.ts b/packages/server/src/services/backup.ts
index 42cc378a..70e37af4 100644
--- a/packages/server/src/services/backup.ts
+++ b/packages/server/src/services/backup.ts
@@ -19,7 +19,7 @@ export const createBackup = async (input: typeof apiCreateBackup._type) => {
if (!newBackup) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the Backup",
+ message: "Error creating the Backup",
});
}
diff --git a/packages/server/src/services/bitbucket.ts b/packages/server/src/services/bitbucket.ts
index 34aa491f..21807156 100644
--- a/packages/server/src/services/bitbucket.ts
+++ b/packages/server/src/services/bitbucket.ts
@@ -28,7 +28,7 @@ export const createBitbucket = async (
if (!newGitProvider) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the git provider",
+ message: "Error creating the Bitbucket provider",
});
}
diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts
index ff660351..50459c45 100644
--- a/packages/server/src/services/compose.ts
+++ b/packages/server/src/services/compose.ts
@@ -254,7 +254,7 @@ export const deployCompose = async ({
applicationName: compose.name,
applicationType: "compose",
// @ts-ignore
- errorMessage: error?.message || "Error to build",
+ errorMessage: error?.message || "Error building",
buildLink,
adminId: compose.project.adminId,
});
@@ -387,7 +387,7 @@ export const deployRemoteCompose = async ({
applicationName: compose.name,
applicationType: "compose",
// @ts-ignore
- errorMessage: error?.message || "Error to build",
+ errorMessage: error?.message || "Error building",
buildLink,
adminId: compose.project.adminId,
});
diff --git a/packages/server/src/services/deployment.ts b/packages/server/src/services/deployment.ts
index 41adf238..0e55ea32 100644
--- a/packages/server/src/services/deployment.ts
+++ b/packages/server/src/services/deployment.ts
@@ -93,7 +93,7 @@ export const createDeployment = async (
if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
return deploymentCreate[0];
@@ -102,7 +102,7 @@ export const createDeployment = async (
console.log(error);
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
};
@@ -159,7 +159,7 @@ export const createDeploymentPreview = async (
if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
return deploymentCreate[0];
@@ -170,7 +170,7 @@ export const createDeploymentPreview = async (
console.log(error);
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
};
@@ -221,7 +221,7 @@ echo "Initializing deployment" >> ${logFilePath};
if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
return deploymentCreate[0];
@@ -232,7 +232,7 @@ echo "Initializing deployment" >> ${logFilePath};
console.log(error);
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
};
@@ -247,7 +247,7 @@ export const removeDeployment = async (deploymentId: string) => {
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to delete this deployment",
+ message: "Error deleting this deployment",
});
}
};
@@ -497,14 +497,14 @@ export const createServerDeployment = async (
if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
return deploymentCreate[0];
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the deployment",
+ message: "Error creating the deployment",
});
}
};
diff --git a/packages/server/src/services/github.ts b/packages/server/src/services/github.ts
index d60c8353..a5d9d863 100644
--- a/packages/server/src/services/github.ts
+++ b/packages/server/src/services/github.ts
@@ -28,7 +28,7 @@ export const createGithub = async (
if (!newGitProvider) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the git provider",
+ message: "Error creating the Git provider",
});
}
diff --git a/packages/server/src/services/gitlab.ts b/packages/server/src/services/gitlab.ts
index 673cf1f1..8e1362c9 100644
--- a/packages/server/src/services/gitlab.ts
+++ b/packages/server/src/services/gitlab.ts
@@ -29,7 +29,7 @@ export const createGitlab = async (
if (!newGitProvider) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the git provider",
+ message: "Error creating the Git provider",
});
}
diff --git a/packages/server/src/services/mount.ts b/packages/server/src/services/mount.ts
index f5211599..dd7bd3e9 100644
--- a/packages/server/src/services/mount.ts
+++ b/packages/server/src/services/mount.ts
@@ -52,7 +52,7 @@ export const createMount = async (input: typeof apiCreateMount._type) => {
if (!value) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error input: Inserting mount",
+ message: "Error inserting mount",
});
}
@@ -64,7 +64,7 @@ export const createMount = async (input: typeof apiCreateMount._type) => {
console.log(error);
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the mount",
+ message: "Error creating the mount",
cause: error,
});
}
@@ -88,10 +88,10 @@ export const createFileMount = async (mountId: string) => {
await createFile(baseFilePath, mount.filePath || "", mount.content || "");
}
} catch (error) {
- console.log(`Error to create the file mount: ${error}`);
+ console.log(`Error creating the file mount: ${error}`);
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the mount",
+ message: "Error creating the mount",
cause: error,
});
}
diff --git a/packages/server/src/services/preview-deployment.ts b/packages/server/src/services/preview-deployment.ts
index 06bf8fb5..ab38c17c 100644
--- a/packages/server/src/services/preview-deployment.ts
+++ b/packages/server/src/services/preview-deployment.ts
@@ -112,7 +112,7 @@ export const removePreviewDeployment = async (previewDeploymentId: string) => {
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to delete this preview deployment",
+ message: "Error deleting this preview deployment",
});
}
};
@@ -189,7 +189,7 @@ export const createPreviewDeployment = async (
if (!previewDeployment) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the preview deployment",
+ message: "Error creating the preview deployment",
});
}
diff --git a/packages/server/src/services/project.ts b/packages/server/src/services/project.ts
index 47e8ac40..adaa07ea 100644
--- a/packages/server/src/services/project.ts
+++ b/packages/server/src/services/project.ts
@@ -30,7 +30,7 @@ export const createProject = async (
if (!newProject) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the project",
+ message: "Error creating the project",
});
}
diff --git a/packages/server/src/services/redirect.ts b/packages/server/src/services/redirect.ts
index 247b18ce..f16dbe42 100644
--- a/packages/server/src/services/redirect.ts
+++ b/packages/server/src/services/redirect.ts
@@ -40,7 +40,7 @@ export const createRedirect = async (
if (!redirect) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the redirect",
+ message: "Error creating the redirect",
});
}
@@ -53,7 +53,7 @@ export const createRedirect = async (
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create this redirect",
+ message: "Error creating this redirect",
cause: error,
});
}
@@ -82,7 +82,7 @@ export const removeRedirectById = async (redirectId: string) => {
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to remove this redirect",
+ message: "Error removing this redirect",
cause: error,
});
}
@@ -116,7 +116,7 @@ export const updateRedirectById = async (
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update this redirect",
+ message: "Error updating this redirect",
});
}
};
diff --git a/packages/server/src/services/registry.ts b/packages/server/src/services/registry.ts
index b03c11b9..2bcf3a4a 100644
--- a/packages/server/src/services/registry.ts
+++ b/packages/server/src/services/registry.ts
@@ -71,7 +71,7 @@ export const removeRegistry = async (registryId: string) => {
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to remove this registry",
+ message: "Error removing this registry",
cause: error,
});
}
@@ -114,7 +114,7 @@ export const updateRegistry = async (
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update this registry",
+ message: "Error updating this registry",
});
}
};
diff --git a/packages/server/src/services/security.ts b/packages/server/src/services/security.ts
index d1709b3f..5efca19f 100644
--- a/packages/server/src/services/security.ts
+++ b/packages/server/src/services/security.ts
@@ -41,7 +41,7 @@ export const createSecurity = async (
if (!securityResponse) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the security",
+ message: "Error creating the security",
});
}
await createSecurityMiddleware(application, securityResponse);
@@ -50,7 +50,7 @@ export const createSecurity = async (
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create this security",
+ message: "Error creating this security",
cause: error,
});
}
@@ -78,7 +78,7 @@ export const deleteSecurityById = async (securityId: string) => {
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to remove this security",
+ message: "Error removing this security",
});
}
};
@@ -100,7 +100,7 @@ export const updateSecurityById = async (
} catch (error) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to update this security",
+ message: "Error updating this security",
});
}
};
diff --git a/packages/server/src/services/server.ts b/packages/server/src/services/server.ts
index 74ba5dd1..081b19fa 100644
--- a/packages/server/src/services/server.ts
+++ b/packages/server/src/services/server.ts
@@ -21,7 +21,7 @@ export const createServer = async (
if (!newServer) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the server",
+ message: "Error creating the server",
});
}
diff --git a/packages/server/src/services/ssh-key.ts b/packages/server/src/services/ssh-key.ts
index 2bf292c7..392f4ecc 100644
--- a/packages/server/src/services/ssh-key.ts
+++ b/packages/server/src/services/ssh-key.ts
@@ -21,7 +21,7 @@ export const createSshKey = async (input: typeof apiCreateSshKey._type) => {
if (!sshKey) {
throw new TRPCError({
code: "BAD_REQUEST",
- message: "Error to create the ssh key",
+ message: "Error creating the SSH Key",
});
}
return sshKey;
diff --git a/packages/server/src/setup/server-setup.ts b/packages/server/src/setup/server-setup.ts
index 57aa7cc3..4fa46c33 100644
--- a/packages/server/src/setup/server-setup.ts
+++ b/packages/server/src/setup/server-setup.ts
@@ -270,20 +270,49 @@ export const setupSwarm = () => `
else
# Get IP address
get_ip() {
- # Try to get IPv4
- local ipv4=\$(curl -4s https://ifconfig.io 2>/dev/null)
+ local ip=""
+
+ # Try IPv4 with multiple services
+ # First attempt: ifconfig.io
+ ip=\$(curl -4s --connect-timeout 5 https://ifconfig.io 2>/dev/null)
+
+ # Second attempt: icanhazip.com
+ if [ -z "\$ip" ]; then
+ ip=\$(curl -4s --connect-timeout 5 https://icanhazip.com 2>/dev/null)
+ fi
+
+ # Third attempt: ipecho.net
+ if [ -z "\$ip" ]; then
+ ip=\$(curl -4s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null)
+ fi
- if [ -n "\$ipv4" ]; then
- echo "\$ipv4"
- else
- # Try to get IPv6
- local ipv6=\$(curl -6s https://ifconfig.io 2>/dev/null)
- if [ -n "\$ipv6" ]; then
- echo "\$ipv6"
+ # If no IPv4, try IPv6 with multiple services
+ if [ -z "\$ip" ]; then
+ # Try IPv6 with ifconfig.io
+ ip=\$(curl -6s --connect-timeout 5 https://ifconfig.io 2>/dev/null)
+
+ # Try IPv6 with icanhazip.com
+ if [ -z "\$ip" ]; then
+ ip=\$(curl -6s --connect-timeout 5 https://icanhazip.com 2>/dev/null)
+ fi
+
+ # Try IPv6 with ipecho.net
+ if [ -z "\$ip" ]; then
+ ip=\$(curl -6s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null)
fi
fi
+
+ if [ -z "\$ip" ]; then
+ echo "Error: Could not determine server IP address automatically (neither IPv4 nor IPv6)." >&2
+ echo "Please set the ADVERTISE_ADDR environment variable manually." >&2
+ echo "Example: export ADVERTISE_ADDR=" >&2
+ exit 1
+ fi
+
+ echo "\$ip"
}
advertise_addr=\$(get_ip)
+ echo "Advertise address: \$advertise_addr"
# Initialize Docker Swarm
docker swarm init --advertise-addr \$advertise_addr
diff --git a/packages/server/src/utils/access-log/handler.ts b/packages/server/src/utils/access-log/handler.ts
index 33c10e51..b1fd925c 100644
--- a/packages/server/src/utils/access-log/handler.ts
+++ b/packages/server/src/utils/access-log/handler.ts
@@ -111,7 +111,7 @@ class LogRotationManager {
);
console.log("USR1 Signal send to Traefik");
} catch (error) {
- console.error("Error to send USR1 Signal to Traefik:", error);
+ console.error("Error sending USR1 Signal to Traefik:", error);
}
}
public async getStatus(): Promise {
diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts
index 6fec7a31..922232a0 100644
--- a/packages/server/src/utils/backups/index.ts
+++ b/packages/server/src/utils/backups/index.ts
@@ -7,7 +7,6 @@ import {
cleanUpSystemPrune,
cleanUpUnusedImages,
} from "../docker/utils";
-import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup";
import { runMariadbBackup } from "./mariadb";
import { runMongoBackup } from "./mongo";
@@ -34,18 +33,18 @@ export const initCronJobs = async () => {
const servers = await getAllServers();
for (const server of servers) {
- const { appName, serverId, enableDockerCleanup } = server;
+ const { serverId, enableDockerCleanup, name } = server;
if (enableDockerCleanup) {
scheduleJob(serverId, "0 0 * * *", async () => {
console.log(
- `SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${appName}`,
+ `SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${name}`,
);
await cleanUpUnusedImages(serverId);
await cleanUpDockerBuilder(serverId);
await cleanUpSystemPrune(serverId);
await sendDockerCleanupNotifications(
admin.adminId,
- `Docker cleanup for Server ${appName}`,
+ `Docker cleanup for Server ${name} (${serverId})`,
);
});
}
@@ -53,7 +52,6 @@ export const initCronJobs = async () => {
const pgs = await db.query.postgres.findMany({
with: {
- project: true,
backups: {
with: {
destination: true,
@@ -67,41 +65,23 @@ export const initCronJobs = async () => {
});
for (const pg of pgs) {
for (const backup of pg.backups) {
- const { schedule, backupId, enabled } = backup;
+ const { schedule, backupId, enabled, database } = backup;
if (enabled) {
- try {
- scheduleJob(backupId, schedule, async () => {
- console.log(
- `PG-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
- );
- runPostgresBackup(pg, backup);
- });
-
- await sendDatabaseBackupNotifications({
- applicationName: pg.name,
- projectName: pg.project.name,
- databaseType: "postgres",
- type: "success",
- adminId: pg.project.adminId,
- });
- } catch (error) {
- await sendDatabaseBackupNotifications({
- applicationName: pg.name,
- projectName: pg.project.name,
- databaseType: "postgres",
- type: "error",
- // @ts-ignore
- errorMessage: error?.message || "Error message not provided",
- adminId: pg.project.adminId,
- });
- }
+ console.log(
+ `[Backup] Postgres DB ${pg.name} for ${database} Activated`,
+ );
+ scheduleJob(backupId, schedule, async () => {
+ console.log(
+ `PG-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
+ );
+ runPostgresBackup(pg, backup);
+ });
}
}
}
const mariadbs = await db.query.mariadb.findMany({
with: {
- project: true,
backups: {
with: {
destination: true,
@@ -116,40 +96,23 @@ export const initCronJobs = async () => {
for (const maria of mariadbs) {
for (const backup of maria.backups) {
- const { schedule, backupId, enabled } = backup;
+ const { schedule, backupId, enabled, database } = backup;
if (enabled) {
- try {
- scheduleJob(backupId, schedule, async () => {
- console.log(
- `MARIADB-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
- );
- await runMariadbBackup(maria, backup);
- });
- await sendDatabaseBackupNotifications({
- applicationName: maria.name,
- projectName: maria.project.name,
- databaseType: "mariadb",
- type: "success",
- adminId: maria.project.adminId,
- });
- } catch (error) {
- await sendDatabaseBackupNotifications({
- applicationName: maria.name,
- projectName: maria.project.name,
- databaseType: "mariadb",
- type: "error",
- // @ts-ignore
- errorMessage: error?.message || "Error message not provided",
- adminId: maria.project.adminId,
- });
- }
+ console.log(
+ `[Backup] MariaDB DB ${maria.name} for ${database} Activated`,
+ );
+ scheduleJob(backupId, schedule, async () => {
+ console.log(
+ `MARIADB-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
+ );
+ await runMariadbBackup(maria, backup);
+ });
}
}
}
const mongodbs = await db.query.mongo.findMany({
with: {
- project: true,
backups: {
with: {
destination: true,
@@ -166,38 +129,19 @@ export const initCronJobs = async () => {
for (const backup of mongo.backups) {
const { schedule, backupId, enabled } = backup;
if (enabled) {
- try {
- scheduleJob(backupId, schedule, async () => {
- console.log(
- `MONGO-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
- );
- await runMongoBackup(mongo, backup);
- });
- await sendDatabaseBackupNotifications({
- applicationName: mongo.name,
- projectName: mongo.project.name,
- databaseType: "mongodb",
- type: "success",
- adminId: mongo.project.adminId,
- });
- } catch (error) {
- await sendDatabaseBackupNotifications({
- applicationName: mongo.name,
- projectName: mongo.project.name,
- databaseType: "mongodb",
- type: "error",
- // @ts-ignore
- errorMessage: error?.message || "Error message not provided",
- adminId: mongo.project.adminId,
- });
- }
+ console.log(`[Backup] MongoDB DB ${mongo.name} Activated`);
+ scheduleJob(backupId, schedule, async () => {
+ console.log(
+ `MONGO-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
+ );
+ await runMongoBackup(mongo, backup);
+ });
}
}
}
const mysqls = await db.query.mysql.findMany({
with: {
- project: true,
backups: {
with: {
destination: true,
@@ -214,31 +158,13 @@ export const initCronJobs = async () => {
for (const backup of mysql.backups) {
const { schedule, backupId, enabled } = backup;
if (enabled) {
- try {
- scheduleJob(backupId, schedule, async () => {
- console.log(
- `MYSQL-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
- );
- await runMySqlBackup(mysql, backup);
- });
- await sendDatabaseBackupNotifications({
- applicationName: mysql.name,
- projectName: mysql.project.name,
- databaseType: "mysql",
- type: "success",
- adminId: mysql.project.adminId,
- });
- } catch (error) {
- await sendDatabaseBackupNotifications({
- applicationName: mysql.name,
- projectName: mysql.project.name,
- databaseType: "mysql",
- type: "error",
- // @ts-ignore
- errorMessage: error?.message || "Error message not provided",
- adminId: mysql.project.adminId,
- });
- }
+ console.log(`[Backup] MySQL DB ${mysql.name} Activated`);
+ scheduleJob(backupId, schedule, async () => {
+ console.log(
+ `MYSQL-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
+ );
+ await runMySqlBackup(mysql, backup);
+ });
}
}
}
diff --git a/packages/server/src/utils/filesystem/directory.ts b/packages/server/src/utils/filesystem/directory.ts
index 0a28cbac..adf25097 100644
--- a/packages/server/src/utils/filesystem/directory.ts
+++ b/packages/server/src/utils/filesystem/directory.ts
@@ -39,7 +39,7 @@ export const removeFileOrDirectory = async (path: string) => {
try {
await execAsync(`rm -rf ${path}`);
} catch (error) {
- console.error(`Error to remove ${path}: ${error}`);
+ console.error(`Error removing ${path}: ${error}`);
throw error;
}
};
@@ -58,7 +58,7 @@ export const removeDirectoryCode = async (
await execAsync(command);
}
} catch (error) {
- console.error(`Error to remove ${directoryPath}: ${error}`);
+ console.error(`Error removing ${directoryPath}: ${error}`);
throw error;
}
};
@@ -77,7 +77,7 @@ export const removeComposeDirectory = async (
await execAsync(command);
}
} catch (error) {
- console.error(`Error to remove ${directoryPath}: ${error}`);
+ console.error(`Error removing ${directoryPath}: ${error}`);
throw error;
}
};
@@ -96,7 +96,7 @@ export const removeMonitoringDirectory = async (
await execAsync(command);
}
} catch (error) {
- console.error(`Error to remove ${directoryPath}: ${error}`);
+ console.error(`Error removing ${directoryPath}: ${error}`);
throw error;
}
};
diff --git a/packages/server/src/wss/utils.ts b/packages/server/src/wss/utils.ts
index 8c6217a2..9ed75c3a 100644
--- a/packages/server/src/wss/utils.ts
+++ b/packages/server/src/wss/utils.ts
@@ -19,7 +19,7 @@ export const getPublicIpWithFallback = async () => {
ip = await publicIpv4();
} catch (error) {
console.log(
- "Error to obtain public IPv4 address, falling back to IPv6",
+ "Error obtaining public IPv4 address, falling back to IPv6",
// @ts-ignore
error.message,
);
@@ -27,7 +27,7 @@ export const getPublicIpWithFallback = async () => {
ip = await publicIpv6();
} catch (error) {
// @ts-ignore
- console.error("Error to obtain public IPv6 address", error.message);
+ console.error("Error obtaining public IPv6 address", error.message);
ip = null;
}
}