From f74f9fa00f38d60088f3632891701a8f48d573b2 Mon Sep 17 00:00:00 2001 From: traveler Date: Sat, 2 May 2026 21:53:41 -0500 Subject: [PATCH] dsf --- swarm/wiki.yaml | 85 ++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 51 deletions(-) diff --git a/swarm/wiki.yaml b/swarm/wiki.yaml index aebab80..70f06d3 100755 --- a/swarm/wiki.yaml +++ b/swarm/wiki.yaml @@ -1,4 +1,3 @@ - networks: netgrimoire: external: true @@ -31,38 +30,31 @@ services: POSTGRES_DB: wiki POSTGRES_USER: wikijs POSTGRES_PASSWORD: F@lcon13 - PUID: "1964" - PGID: "1964" volumes: - - /data/nfs/znas/Docker/wikijs-db:/var/lib/postgresql/data deploy: - mode: replicated - replicas: 1 - - restart_policy: condition: any delay: 5s max_attempts: 10 window: 60s + placement: + constraints: + - node.platform.arch != aarch64 + - node.platform.arch != arm labels: - gremlin.version: "2026-04-1" - monitor.name: Wikijs-db - monitor.url: http://wikijs-db:8080 + gremlin.uid.exempt: "true" + gremlin.uid.reason: "Postgres requires UID 999 — PUID/PGID not supported" gremlin.caddy.skip: "true" - gremlin.authentik.skip: "true" gremlin.homepage.skip: "true" + gremlin.monitor.skip: "true" diun.enable: "true" - wikijs: image: requarks/wiki:2 networks: - netgrimoire - # Run as your default container identity - # user: "1964:1964" environment: TZ: America/Chicago DB_TYPE: postgres @@ -84,67 +76,58 @@ services: - /data/nfs/znas/Docker/wikijs/repo:/wiki/repo - /data/nfs/znas/Docker/wikijs/ssh:/wiki/ssh:ro deploy: - mode: replicated - replicas: 1 - - restart_policy: condition: any delay: 5s max_attempts: 10 window: 60s + placement: + constraints: + - node.platform.arch != aarch64 + - node.platform.arch != arm labels: - gremlin.port: 3000 - homepage.group: "Documentation" - homepage.name: "Wiki" - homepage.icon: "wikijs.png" - homepage.href: "https://wiki.netgrimoire.com" - homepage.description: "Documentation Server" + gremlin.version: "2026-04-1" + gremlin.port: "3000" + caddy: wiki.netgrimoire.com + caddy.reverse_proxy: wikijs:3000 + caddy.import_1: crowdsec + caddy.import_2: authentik monitor.name: Wikijs monitor.url: http://wikijs:3000 + homepage.group: Documentation + homepage.name: Wiki + homepage.icon: wikijs.png + homepage.href: https://wiki.netgrimoire.com + homepage.description: Documentation Server diun.enable: "true" - # Caddy (adjust hostnames to your domain) - caddy: wiki.netgrimoire.com - caddy.reverse_proxy: "wikijs:3000" - - - # Kuma labels (your preferred pattern) - drawio: image: jgraph/drawio:latest networks: - netgrimoire - # user: "1964:1964" environment: TZ: America/Chicago PUID: "1964" PGID: "1964" deploy: - mode: replicated - replicas: 1 - - - restart_policy: condition: any delay: 5s max_attempts: 10 window: 60s labels: + gremlin.version: "2026-04-1" gremlin.arm.allow: "true" - gremlin.port: 8080 - homepage.group: "Documentation" - homepage.name: "Draw Net" - homepage.icon: "draw-io.png" - homepage.href: "https://draw.netgrimoire.com" - homepage.description: "Draw Server" - monitor.name: Drawio - monitor.url: http://drawio:8080 - diun.enable: "true" - - # Caddy (adjust hostnames to your domain) + gremlin.port: "8080" caddy: draw.netgrimoire.com caddy.reverse_proxy: drawio:8080 - - # Kuma labelsfggfgf + caddy.import_1: crowdsec + caddy.import_2: authentik + monitor.name: Drawio + monitor.url: http://drawio:8080 + homepage.group: Documentation + homepage.name: Draw Net + homepage.icon: draw-io.png + homepage.href: https://draw.netgrimoire.com + homepage.description: Draw Server + diun.enable: "true" \ No newline at end of file