Merge branch 'canary' into template/twenty

apps/dokploy/components/dashboard/settings/appearance-form.tsx

@@ -37,7 +37,7 @@ const appearanceFormSchema = z.object({
 	theme: z.enum(["light", "dark", "system"], {
 		required_error: "Please select a theme.",
 	}),
-	language: z.enum(["en", "pl", "ru", "zh-Hans"], {
+	language: z.enum(["en", "pl", "ru", "de", "zh-Hans"], {
 		required_error: "Please select a language.",
 	}),
 });
@@ -176,6 +176,7 @@ export function AppearanceForm() {
 													{ label: "English", value: "en" },
 													{ label: "Polski", value: "pl" },
 													{ label: "Русский", value: "ru" },
+													{ label: "Deutsch", value: "de" },
 													{ label: "简体中文", value: "zh-Hans" },
 												].map((preset) => (
 													<SelectItem key={preset.label} value={preset.value}>

apps/dokploy/next-i18next.config.cjs

@@ -2,7 +2,7 @@
 module.exports = {
 	i18n: {
 		defaultLocale: "en",
-		locales: ["en", "pl", "ru", "zh-Hans"],
+		locales: ["en", "pl", "ru", "de", "zh-Hans"],
 		localeDetection: false,
 	},
 	fallbackLng: "en",

apps/dokploy/pages/_app.tsx

@@ -71,7 +71,7 @@ export default api.withTRPC(
 		{
 			i18n: {
 				defaultLocale: "en",
-				locales: ["en", "pl", "ru", "zh-Hans"],
+				locales: ["en", "pl", "ru", "de", "zh-Hans"],
 				localeDetection: false,
 			},
 			fallbackLng: "en",

apps/dokploy/public/locales/de/common.json

@@ -0,0 +1 @@
+{}

apps/dokploy/public/locales/de/settings.json

@@ -0,0 +1,44 @@
+{
+	"settings.common.save": "Speichern",
+	"settings.server.domain.title": "Server-Domain",
+	"settings.server.domain.description": "Füg eine Domain zu deiner Server-Anwendung hinzu.",
+	"settings.server.domain.form.domain": "Domain",
+	"settings.server.domain.form.letsEncryptEmail": "Let's Encrypt E-Mail",
+	"settings.server.domain.form.certificate.label": "Zertifikat",
+	"settings.server.domain.form.certificate.placeholder": "Wähl ein Zertifikat aus",
+	"settings.server.domain.form.certificateOptions.none": "Keins",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (Standard)",
+
+	"settings.server.webServer.title": "Web-Server",
+	"settings.server.webServer.description": "Lade den Web-Server neu oder reinige ihn.",
+	"settings.server.webServer.actions": "Aktionen",
+	"settings.server.webServer.reload": "Neu laden",
+	"settings.server.webServer.watchLogs": "Logs anschauen",
+	"settings.server.webServer.updateServerIp": "Server-IP Aktualisieren",
+	"settings.server.webServer.server.label": "Server",
+	"settings.server.webServer.traefik.label": "Traefik",
+	"settings.server.webServer.traefik.modifyEnv": "Umgebungsvariablen ändern",
+	"settings.server.webServer.storage.label": "Speicherplatz",
+	"settings.server.webServer.storage.cleanUnusedImages": "Nicht genutzte Bilder löschen",
+	"settings.server.webServer.storage.cleanUnusedVolumes": "Nicht genutzte Volumes löschen",
+	"settings.server.webServer.storage.cleanStoppedContainers": "Gestoppte Container löschen",
+	"settings.server.webServer.storage.cleanDockerBuilder": "Docker Builder & System bereinigen",
+	"settings.server.webServer.storage.cleanMonitoring": "Monitoring bereinigen",
+	"settings.server.webServer.storage.cleanAll": "Alles bereinigen",
+
+	"settings.profile.title": "Konto",
+	"settings.profile.description": "Ändere die Details deines Profiles hier.",
+	"settings.profile.email": "E-Mail",
+	"settings.profile.password": "Passwort",
+	"settings.profile.avatar": "Avatar",
+
+	"settings.appearance.title": "Aussehen",
+	"settings.appearance.description": "Pass das Design deines Dashboards an.",
+	"settings.appearance.theme": "Theme",
+	"settings.appearance.themeDescription": "Wähl ein Theme für dein Dashboard aus",
+	"settings.appearance.themes.light": "Hell",
+	"settings.appearance.themes.dark": "Dunkel",
+	"settings.appearance.themes.system": "System",
+	"settings.appearance.language": "Sprache",
+	"settings.appearance.languageDescription": "Wähl eine Sprache für dein Dashboard aus"
+}

apps/dokploy/templates/ryot/docker-compose.yml

@@ -0,0 +1,39 @@
+version: '3.7'
+
+services:
+  ryot-app:
+    image: ignisda/ryot:v7.10
+    networks:
+      - dokploy-network
+    environment:
+      - DATABASE_URL=postgres://postgres:${POSTGRES_PASSWORD}@ryot-db:5432/postgres
+      - SERVER_ADMIN_ACCESS_TOKEN=${ADMIN_ACCESS_TOKEN}
+      - TZ=UTC
+      # Optional: Uncomment and set your pro key if you have one
+      # - SERVER_PRO_KEY=${SERVER_PRO_KEY}
+    depends_on:
+      ryot-db:
+        condition: service_healthy
+    restart: always
+    pull_policy: always
+
+  ryot-db:
+    image: postgres:16-alpine
+    networks:
+      - dokploy-network
+    volumes:
+      - ryot-postgres-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=postgres
+      - TZ=UTC
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
+
+volumes:
+  ryot-postgres-data: 

apps/dokploy/templates/ryot/index.ts

@@ -0,0 +1,34 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateBase64,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const postgresPassword = generatePassword();
+	const adminAccessToken = generateBase64(32);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 8000,
+			serviceName: "ryot-app",
+		},
+	];
+
+	const envs = [
+		`POSTGRES_PASSWORD=${postgresPassword}`,
+		`ADMIN_ACCESS_TOKEN=${adminAccessToken}`,
+		"# Optional: Uncomment and set your pro key if you have one",
+		"# SERVER_PRO_KEY=your_pro_key_here",
+	];
+
+	return {
+		domains,
+		envs,
+	};
+}

apps/dokploy/templates/templates.ts

@@ -881,5 +881,35 @@ export const templates: TemplateData[] = [
 		},
 		tags: ["crm", "sales", "business"],
 		load: () => import("./twenty/index").then((m) => m.generate),
+  },
+    {
+		id: "yourls",
+		name: "YOURLS",
+		version: "1.9.2",
+		description:
+			"YOURLS (Your Own URL Shortener) is a set of PHP scripts that will allow you to run your own URL shortening service (a la TinyURL or Bitly).",
+		logo: "yourls.svg",
+		links: {
+			github: "https://github.com/YOURLS/YOURLS",
+			website: "https://yourls.org/",
+			docs: "https://yourls.org/#documentation",
+		},
+		tags: ["url-shortener", "php"],
+		load: () => import("./yourls/index").then((m) => m.generate),
+  },
+    {
+		id: "ryot",
+		name: "Ryot",
+		version: "v7.10",
+		description:
+			"A self-hosted platform for tracking various media types including movies, TV shows, video games, books, audiobooks, and more.",
+		logo: "ryot.png",
+		links: {
+			github: "https://github.com/IgnisDa/ryot",
+			website: "https://ryot.dev/",
+			docs: "https://ryot.dev/docs/getting-started",
+		},
+		tags: ["media", "tracking", "self-hosted"],
+		load: () => import("./ryot/index").then((m) => m.generate),
 	},
 ];

apps/dokploy/templates/yourls/docker-compose.yml

@@ -0,0 +1,43 @@
+version: '3.7'
+
+services:
+  yourls-app:
+    image: yourls:1.9.2
+    networks:
+      - dokploy-network
+    environment:
+      YOURLS_SITE: https://${YOURLS_HOST}
+      YOURLS_USER: ${YOURLS_ADMIN_USER}
+      YOURLS_PASS: ${YOURLS_ADMIN_PASSWORD}
+      YOURLS_DB_HOST: yourls-mysql
+      YOURLS_DB_USER: yourls
+      YOURLS_DB_PASS: ${MYSQL_PASSWORD}
+      YOURLS_DB_NAME: yourls
+    volumes:
+      - yourls-data:/var/www/html
+    depends_on:
+      yourls-mysql:
+        condition: service_healthy
+    restart: always
+
+  yourls-mysql:
+    image: mysql:5.7
+    networks:
+      - dokploy-network
+    environment:
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: yourls
+      MYSQL_USER: yourls
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    volumes:
+      - yourls-mysql-data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u$$MYSQL_USER", "-p$$MYSQL_PASSWORD"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: always
+
+volumes:
+  yourls-data:
+  yourls-mysql-data: 

apps/dokploy/templates/yourls/index.ts

@@ -0,0 +1,35 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const mysqlPassword = generatePassword();
+	const mysqlRootPassword = generatePassword();
+	const adminPassword = generatePassword();
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 80,
+			serviceName: "yourls-app",
+		},
+	];
+
+	const envs = [
+		`YOURLS_HOST=${mainDomain}`,
+		"YOURLS_ADMIN_USER=admin",
+		`YOURLS_ADMIN_PASSWORD=${adminPassword}`,
+		`MYSQL_PASSWORD=${mysqlPassword}`,
+		`MYSQL_ROOT_PASSWORD=${mysqlRootPassword}`,
+	];
+
+	return {
+		domains,
+		envs,
+	};
+}

apps/dokploy/utils/hooks/use-locale.ts

@@ -1,6 +1,6 @@
 import Cookies from "js-cookie";
 
-const SUPPORTED_LOCALES = ["en", "pl", "ru", "zh-Hans"] as const;
+const SUPPORTED_LOCALES = ["en", "pl", "ru", "de", "zh-Hans"] as const;
 
 type Locale = (typeof SUPPORTED_LOCALES)[number];