Merge branch 'canary' into 262-ssh-keys-are-not-reusable-after-a-dokploy-update

server/setup/traefik-setup.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { chmodSync, existsSync, mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import type { CreateServiceOptions } from "dockerode";
 import { dump } from "js-yaml";
@@ -86,6 +86,7 @@ export const initializeTraefik = async () => {
 
 export const createDefaultServerTraefikConfig = () => {
 	const configFilePath = path.join(DYNAMIC_TRAEFIK_PATH, "dokploy.yml");
+
 	if (existsSync(configFilePath)) {
 		console.log("Default traefik config already exists");
 		return;
@@ -125,6 +126,11 @@ export const createDefaultServerTraefikConfig = () => {
 
 export const createDefaultTraefikConfig = () => {
 	const mainConfig = path.join(MAIN_TRAEFIK_PATH, "traefik.yml");
+	const acmeJsonPath = path.join(DYNAMIC_TRAEFIK_PATH, "acme.json");
+
+	if (existsSync(acmeJsonPath)) {
+		chmodSync(acmeJsonPath, "600");
+	}
 	if (existsSync(mainConfig)) {
 		console.log("Main config already exists");
 		return;

templates/appsmith/docker-compose.yml

@@ -1,18 +1,18 @@
 version: "3.8"
 services:
-   appsmith:
-     image: index.docker.io/appsmith/appsmith-ee:v1.29
-     networks:
-        - dokploy-network
-     ports:
-         - ${APP_SMITH_PORT}
-     labels:
-        - "traefik.enable=true"
-        - "traefik.http.routers.${HASH}.rule=Host(`${APP_SMITH_HOST}`)"
-        - "traefik.http.services.${HASH}.loadbalancer.server.port=${APP_SMITH_PORT}"
-     volumes:
-         - ./stacks:/appsmith-stacks
+  appsmith:
+    image: index.docker.io/appsmith/appsmith-ee:v1.29
+    networks:
+      - dokploy-network
+    ports:
+      - ${APP_SMITH_PORT}
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.${HASH}.rule=Host(`${APP_SMITH_HOST}`)"
+      - "traefik.http.services.${HASH}.loadbalancer.server.port=${APP_SMITH_PORT}"
+    volumes:
+      - ../files/stacks:/appsmith-stacks
 
 networks:
   dokploy-network:
-    external: true
+    external: true

templates/directus/docker-compose.yml

@@ -23,8 +23,8 @@ services:
     ports:
       - 8055
     volumes:
-      - ./uploads:/directus/uploads
-      - ./extensions:/directus/extensions
+      - ../files/uploads:/directus/uploads
+      - ../files/extensions:/directus/extensions
     depends_on:
       - cache
       - database
@@ -53,4 +53,4 @@ networks:
   dokploy-network:
     external: true
 volumes:
-  directus: 
+  directus:

templates/listmonk/docker-compose.yml

@@ -23,10 +23,15 @@ services:
     networks:
       - dokploy-network
     volumes:
-      - ./config.toml:/listmonk/config.toml
+      - ../files/config.toml:/listmonk/config.toml
     depends_on:
       - db
-    command: [sh, -c, "sleep 3 && ./listmonk --install --idempotent --yes --config config.toml"]
+    command:
+      [
+        sh,
+        -c,
+        "sleep 3 && ./listmonk --install --idempotent --yes --config config.toml",
+      ]
 
   app:
     restart: unless-stopped
@@ -41,7 +46,7 @@ services:
       - db
       - setup
     volumes:
-      - ./config.toml:/listmonk/config.toml
+      - ../files/config.toml:/listmonk/config.toml
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.${HASH}.rule=Host(`${LISTMONK_HOST}`)"
@@ -50,7 +55,7 @@ services:
 volumes:
   listmonk-data:
     driver: local
-    
+
 networks:
   dokploy-network:
     external: true

templates/odoo/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3.8'
+version: "3.8"
 services:
   web:
     image: odoo:16.0
@@ -18,8 +18,8 @@ services:
       - "traefik.http.services.${HASH}.loadbalancer.server.port=${ODOO_PORT}"
     volumes:
       - odoo-web-data:/var/lib/odoo
-      - ./config:/etc/odoo
-      - ./addons:/mnt/extra-addons
+      - ../files/config:/etc/odoo
+      - ../files/addons:/mnt/extra-addons
 
   db:
     image: postgres:13
@@ -36,7 +36,6 @@ volumes:
   odoo-web-data:
   odoo-db-data:
 
-
 networks:
   dokploy-network:
     external: true

templates/plausible/docker-compose.yml

@@ -18,8 +18,8 @@ services:
     volumes:
       - event-data:/var/lib/clickhouse
       - event-logs:/var/log/clickhouse-server
-      - ./clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
-      - ./clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
+      - ../files/clickhouse/clickhouse-config.xml:/etc/clickhouse-server/config.d/logging.xml:ro
+      - ../files/clickhouse/clickhouse-user-config.xml:/etc/clickhouse-server/users.d/logging.xml:ro
     ulimits:
       nofile:
         soft: 262144
@@ -50,7 +50,7 @@ volumes:
     driver: local
   event-logs:
     driver: local
-    
+
 networks:
   dokploy-network:
-    external: true
+    external: true