fix: add start-hermes.sh baked into image, replace broken ENTRYPOINT

- New start-hermes.sh: multi-profile launcher that works with s6-overlay's
  main-program model (replaces bash->tini->entrypoint.sh chain)
- Dockerfile: COPY start-hermes.sh into /usr/local/bin/ alongside
  run-multi-gateways.sh (which is now unused but kept for reference)
- compose.yml: remove entrypoint override, CMD now points at
  /usr/local/bin/start-hermes.sh via the image default ENTRYPOINT

Fixes the SIGTERM crash loop caused by S6_CMD_ARG0 being unset when the
deprecated entrypoint.sh shim bypassed s6-overlay's /init.

ai/compose.yml

@@ -1,46 +1,24 @@
 services:
 
-  # webui:
-  #   image: ghcr.io/open-webui/open-webui:main
-  #   volumes:
-  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
-  #   restart: always
-  #   environment:
-  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
-  #   networks:
-  #     - ai_net
-  #     - ai_backend
-  #   labels:
-  #     - "traefik.enable=true"
-
-  #     # Router for HTTP + redirection to HTTPS
-  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-http.entrypoints=web"
-  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
-
-  #     # Router for HTTPS with TLS
-  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
-  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
-  #     - "traefik.http.routers.webui-https.tls=true"
-  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
-
   hermes:
     build:
       context: ./hermes
       ssh:
         - default
     container_name: hermes
-    entrypoint: ["/bin/bash", "-c",
-      "bash /opt/data/hermes-tools/install.sh && bash /usr/local/bin/run-multi-gateways.sh && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
-      "hermes-entrypoint"]
     restart: always
-    # Gateway run enables the internal API server on port 8642
-    command: gateway run
+    # Use the image default ENTRYPOINT ["/init", "/opt/hermes/docker/main-wrapper.sh"]
+    # for proper s6-overlay supervision. The CMD runs our multi-profile launcher
+    # which spawns per-profile gateways in background, then the default gateway
+    # in foreground (keeps the container alive).
+    command: ["/usr/local/bin/start-hermes.sh"]
     environment:
+      - HERMES_UID=10000
+      - HERMES_GID=10000
       - OLLAMA_HOST=http://ollama:11434
       - HERMES_DASHBOARD=1
       # Multi-profile: comma-separated list of profiles to run as gateways.
-      # The entrypoint reads this and starts one gateway per profile.
+      # start-hermes.sh reads this and starts one gateway per profile.
       # Add profiles here when they exist on disk (e.g. default,researcher,writer)
       - HERMES_PROFILES=ashley,claire,finn,matt,paul
       - API_SERVER_ENABLED=true
@@ -59,10 +37,7 @@ services:
       - TZ=America/Montreal
     volumes:
       - /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
-      # Syncthing-shared org files — read-only view of user's agenda
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/opt/data/telos-ro:ro
-      # Syncthing-shared inbox — write tasks here, they sync to user's laptop
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/opt/data/telos-rw:rw
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/opt/data/ExoKortex
     devices:
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
@@ -109,24 +84,29 @@ services:
       - "21027:21027/udp"
     environment:
       - TZ=America/Montreal
+      - PUID=10000
+      - PGID=10000
     volumes:
-      - /mnt/HoardingCow_docker_data/Syncthing/config:/var/syncthing/config
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-ro:/telos-ro
-      - /mnt/HoardingCow_docker_data/Syncthing/telos-rw:/telos-rw
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/config:/var/syncthing/config
+      - /mnt/HoardingCow_docker_data/Hermes/Syncthing/ExoKortex:/ExoKortex
     networks:
       - ai_backend
       - ai_net
     labels:
       - "traefik.enable=true"
+      - "traefik.docker.network=ai_net"
+
       - "traefik.http.routers.syncthing-http.rule=Host(`syncthing.lazyworkhorse.net`)"
       - "traefik.http.routers.syncthing-http.entrypoints=web"
       - "traefik.http.routers.syncthing-http.middlewares=redirect-to-https"
+
       - "traefik.http.routers.syncthing-https.rule=Host(`syncthing.lazyworkhorse.net`)"
       - "traefik.http.routers.syncthing-https.entrypoints=websecure"
       - "traefik.http.routers.syncthing-https.tls=true"
       - "traefik.http.routers.syncthing-https.tls.certresolver=njalla"
-      - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
+      - "traefik.http.routers.syncthing-https.middlewares=hermes-auth"
 
+      - "traefik.http.services.syncthing.loadbalancer.server.port=8384"
 
   ollama:
     build:
@@ -203,10 +183,8 @@ services:
       # Service Loadbalancer (nginx port)
       - "traefik.http.services.honcho.loadbalancer.server.port=80"
     depends_on:
-      honcho-db:
-        condition: service_healthy
-      honcho-redis:
-        condition: service_healthy
+      - honcho-db
+      - honcho-redis
 
   honcho-db:
     image: pgvector/pgvector:pg15
@@ -225,11 +203,6 @@ services:
       - ./honcho/init-db.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
       - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U honcho -d honcho"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
   honcho-redis:
     image: redis:8
@@ -241,15 +214,10 @@ services:
       - /mnt/HoardingCow_docker_data/Honcho/redis:/data
     networks:
       - ai_backend
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping"]
-      interval: 5s
-      timeout: 5s
-      retries: 5
 
 networks:
   ai_net:
-    external: true
+    driver: bridge
     name: ai_net
   ai_backend:
     driver: bridge
@@ -257,7 +225,7 @@ networks:
 
 volumes:
   honcho_data:
-    external: true
+    driver: bridge
     name: honcho_data
     
   # llama_cpp_devstral:
@@ -348,6 +316,30 @@ volumes:
   #     - /mnt/HoardingCow_docker_data/vllm/models:/root/.cache/huggingface
   #   restart: unless-stopped
 
+  # webui:
+  #   image: ghcr.io/open-webui/open-webui:main
+  #   volumes:
+  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
+  #   restart: always
+  #   environment:
+  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
+  #   networks:
+  #     - ai_net
+  #     - ai_backend
+  #   labels:
+  #     - "traefik.enable=true"
+
+  #     # Router for HTTP + redirection to HTTPS
+  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-http.entrypoints=web"
+  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
+
+  #     # Router for HTTPS with TLS
+  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
+  #     - "traefik.http.routers.webui-https.tls=true"
+  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
+
   # n8n:
   #   image: n8nio/n8n:latest
   #   container_name: n8n

ai/hermes/Dockerfile

@@ -9,26 +9,6 @@
 # ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
 FROM nousresearch/hermes-agent:latest
 
-# ---------- Overlay our forked source ----------
-# Uses SSH agent forwarding from the build host (no key baked into image).
-# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
-# Only the Python source, web UI source, and config change.
-RUN --mount=type=ssh \
-    mkdir -p /root/.ssh && \
-    ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
-    cd /tmp && \
-    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
-    git clone --depth 1 --branch main \
-    git@code.lazyworkhorse.net:gortium/hermes-agent.git fork && \
-    rm -rf fork/node_modules fork/.venv fork/.git && \
-    cp -a fork/. /opt/hermes/ && \
-    rm -rf /tmp/fork /root/.ssh/
-
-# ---------- Reinstall Python package (editable) ----------
-# Picks up source changes from our fork.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir --no-deps -e /opt/hermes
-
 # ---------- Extra system deps ----------
 USER root
 RUN apt-get update && \
@@ -43,12 +23,6 @@ RUN apt-get update && \
 # ---------- UV ----------
 COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
 
-# ---------- Matrix bridge + extra pip deps ----------
-# Previously installed inline at container startup and persisted via volume mount.
-# Now baked into the image so the fragile venv volume mount can be removed.
-RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
-
 WORKDIR /opt/hermes
 
 # ---------- Matrix bridge + extra pip deps ----------
@@ -88,6 +62,11 @@ PYEOF
 # Launches one gateway process per profile (HERMES_PROFILES env var)
 COPY --chmod=0755 run-multi-gateways.sh /usr/local/bin/run-multi-gateways.sh
 
+# ---------- Install s6-overlay compatible startup script ----------
+# Runs as the CMD via s6-overlay's main-program model.
+# Replaces the old bash->tini->entrypoint.sh chain that caused SIGTERM crash loops.
+COPY --chmod=0755 start-hermes.sh /usr/local/bin/start-hermes.sh
+
 # ---------- Runtime ----------
 USER hermes
 ENV HERMES_HOME=/opt/data
@@ -100,4 +79,9 @@ ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
 USER root
 RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
 
-VOLUME [ "/opt/data" ]
+VOLUME [ "/opt/data" ]
+
+# Switch to the hermes user so the container runs unprivileged.
+# All child processes inherit this user — no more orphan root processes
+# that escape gosu privilege drops in the entrypoint.
+USER hermes

ai/hermes/start-hermes.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+# Multi-profile + default gateway launcher — runs as the CMD via s6-overlay.
+#
+# The image's default ENTRYPOINT ["/init", "/opt/hermes/docker/main-wrapper.sh"]
+# starts the s6 supervision tree, then exec's main-wrapper.sh with the CMD args.
+# main-wrapper.sh sources the venv, drops to the hermes user via s6-setuidgid,
+# and exec's this script.
+#
+# This script:
+#   1. Launches per-profile background gateways (HERMES_PROFILES env var)
+#   2. Starts the default gateway in foreground (keeps the container alive)
+#
+# Replaces the old approach of chaining bash -> tini -g -> deprecated entrypoint.sh
+# which bypassed s6-overlay and caused the SIGTERM crash loop.
+
+set -e
+
+HERMES_BIN="/opt/hermes/.venv/bin/hermes"
+
+# --- Multi-profile gateways (background) ---
+if [ -n "${HERMES_PROFILES:-}" ]; then
+    echo "[start-hermes] Launching per-profile gateways: ${HERMES_PROFILES}"
+    IFS=',' read -ra PROFILES <<< "${HERMES_PROFILES}"
+    for profile in "${PROFILES[@]}"; do
+        profile="$(echo "${profile}" | xargs)"  # trim whitespace
+        [ -z "${profile}" ] && continue
+        echo "[start-hermes]  -> background gateway for profile '${profile}'"
+        # No gosu/s6-setuidgid needed — we're already running as the hermes user
+        # (main-wrapper.sh drops privileges before exec'ing this script).
+        nohup "${HERMES_BIN}" --profile "${profile}" gateway run \
+            >> "/opt/data/logs/gateway-${profile}.log" 2>&1 &
+    done
+    echo "[start-hermes] All profile gateways launched"
+fi
+
+# --- Default gateway (foreground — keeps container alive) ---
+echo "[start-hermes] Starting default gateway (foreground)"
+exec "${HERMES_BIN}" gateway run

authentification/compose.yml

@@ -32,5 +32,5 @@ services:
 
 networks:
   auth_net:
-    external: true
+    driver: bridge
     name: auth_net

backup/compose.yml

@@ -68,33 +68,33 @@ services:
     labels:
       - "traefik.enable=false" # Internal only, accessed by restic-browser
 
-  restic-browser:
-    image: embergarage/restic-browser:latest
-    container_name: restic-browser
-    restart: always 
-    environment:
-      - TZ=America/Montreal
-      - RESTIC_REPOSITORY=http://restic-server:8080
-      - RESTIC_PASSWORD=${RESTIC_PASSWORD}
-    networks:
-      - backup_net
-    labels:
-      - "traefik.enable=true"
-      # 1. HTTP to HTTPS Redirect
-      - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
-      - "traefik.http.routers.restic-browser-http.entrypoints=web"
-      - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
-      
-      # 2. HTTPS Configuration
-      - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
-      - "traefik.http.routers.restic-browser.entrypoints=websecure"
-      - "traefik.http.routers.restic-browser.tls=true"
-      - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
-      
-      # 3. Backend Service Config
-      - "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
+# restic-browser:
+#   image: mazzolino/restic-browser:latest
+#   container_name: restic-browser
+#   restart: always 
+#   environment:
+#     - TZ=America/Montreal
+#     - RESTIC_REPOSITORY=http://restic-server:8080
+#     - RESTIC_PASSWORD=${RESTIC_PASSWORD}
+#   networks:
+#     - backup_net
+#   labels:
+#     - "traefik.enable=true"
+#     # 1. HTTP to HTTPS Redirect
+#     - "traefik.http.routers.restic-browser-http.rule=Host(`backup.lazyworkhorse.net`)"
+#     - "traefik.http.routers.restic-browser-http.entrypoints=web"
+#     - "traefik.http.routers.restic-browser-http.middlewares=redirect-to-https@docker"
+#     
+#     # 2. HTTPS Configuration
+#     - "traefik.http.routers.restic-browser.rule=Host(`backup.lazyworkhorse.net`)"
+#     - "traefik.http.routers.restic-browser.entrypoints=websecure"
+#     - "traefik.http.routers.restic-browser.tls=true"
+#     - "traefik.http.routers.restic-browser.tls.certresolver=njalla"
+#     
+#     # 3. Backend Service Config
+#     - "traefik.http.services.restic-browser.loadbalancer.server.port=8000"
 
 networks:
   backup_net:
-    external: true
+    driver: bridge
     name: backup_net

cloudstorage/compose.yml

@@ -6,6 +6,7 @@ services:
     restart: always
     networks:
       - cloud_net
+      - cloud_internal
     environment:
       - PUID=1000
       - PGID=1000
@@ -51,7 +52,7 @@ services:
     container_name: nextcloud_cron
     restart: always 
     networks:
-      - cloud_net
+      - cloud_internal
     entrypoint: /cron.sh
     volumes:
       - /mnt/HoardingCow_docker_data/NextCloud/data:/var/www/html:rw
@@ -75,7 +76,7 @@ services:
 
 networks:
   cloud_net:
-    external: true
+    driver: bridge
     name: cloud_net
   cloud_internal:
     driver: bridge

coms/compose.yml

@@ -103,7 +103,7 @@ services:
 
 networks:
   coms_net:
-    external: true
+    driver: bridge
     name: coms_net
   coms_backend:
     driver: bridge

finance/compose.yml

@@ -37,4 +37,5 @@ services:
 
 networks:
   finance_net:
-    external: true
+    driver: bridge
+    name: finance_net

homeautomation/compose.yml

@@ -12,8 +12,8 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Home_Assistant:/config:rw
     networks:
-      - home_auto_net
-      - home_auto_backend
+      - home_net
+      - home_backend
     labels:
       - "traefik.enable=true"
 
@@ -34,7 +34,7 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/Mosquitto:/mosquitto
     networks:
-      - home_auto_backend
+      - home_backend
     # ports:
     #   - 1883:1883
     #   - 9001:9001
@@ -43,7 +43,7 @@ services:
     image: registry.gitlab.com/hydroqc/hydroqc2mqtt:1.3.0
     restart: always
     networks:
-      - home_auto_backend
+      - home_backend
     environment:
       MQTT_USERNAME: hass
       MQTT_PASSWORD: ${MQTT_PASSWORD}
@@ -88,8 +88,9 @@ services:
   #   restart: unless-stopped
 
 networks:
-  home_auto_net:
-    external: true
-  home_auto_backend:
+  home_net:
     driver: bridge
-    name: home_auto_backend
+    name: home_net
+  home_backend:
+    driver: bridge
+    name: home_backend

homepage/compose.yml

@@ -38,4 +38,5 @@ services:
 
 networks:
   homepage_net:
-    external: true
+    driver: bridge
+    name: homepage_net

network/compose.yml

@@ -36,9 +36,9 @@ services:
       - cloud_net
       - coms_net
       - finance_net
-      - home_auto_net
+      - home_net
       - homepage_net
-      - passman_net
+      - pass_net
       - tak_net
       - vc_net
 
@@ -99,15 +99,15 @@ networks:
   finance_net:
     driver: bridge
     name: finance_net
-  home_auto_net:
+  home_net:
     driver: bridge
-    name: home_auto_net
+    name: home_net
   homepage_net:
     driver: bridge
     name: homepage_net
-  passman_net:
+  pass_net:
     driver: bridge
-    name: passman_net
+    name: pass_net
   tak_net:
     driver: bridge
     name: tak_net

passwordmanager/compose.yml

@@ -13,7 +13,7 @@ services:
     volumes:
       - /mnt/HoardingCow_docker_data/BitWarden/data:/data:rw
     networks:
-      - passman_net
+      - pass_net
     restart: always
     labels:
       - "traefik.enable=true"
@@ -32,5 +32,6 @@ services:
       # Internal service
       - "traefik.http.services.pass.loadbalancer.server.port=80"
 networks:
-  passman_net:
-    external: true
+  pass_net:
+    driver: bridge
+    name: pass_net

tak/compose.yml

@@ -92,7 +92,8 @@ services:
 
 networks:
   tak_net:
-    external: true
+    driver: bridge
+    name: tak_net
   tak_backend:
     driver: bridge
     name: tak_backend

versioncontrol/compose.yml

@@ -61,4 +61,5 @@ services:
 
 networks:
   vc_net:
-    external: true
+    driver: bridge
+    name: vc_net

vpn/compose.yml

@@ -12,7 +12,7 @@ services:
       - SYS_MODULE
     environment:
       - WG_HOST=vpn.lazyworkhorse.net
-      - PASSWORD=${WG_PASSWORD}
+      - PASSWORD_HASH=${WG_PASSWORD_HASH}
       - WG_PORT=51820
       - WG_DEFAULT_ADDRESS=10.8.0.x
       - WG_DEFAULT_DNS=1.1.1.1,8.8.8.8
@@ -22,7 +22,6 @@ services:
       - UI_CHART_TYPE=0
     ports:
       - "51820:51820/udp"
-      - "51821:51821/tcp"
     volumes:
       - /mnt/HoardingCow_docker_data/WireGuard:/etc/wireguard:rw
     sysctls:
@@ -31,8 +30,31 @@ services:
     restart: unless-stopped
     networks:
       - vpn_net
+    labels:
+      - "traefik.enable=true"
+
+      # HTTP → HTTPS redirect
+      - "traefik.http.routers.wireguard-http.rule=Host(vpn.lazyworkhorse.net)"
+      - "traefik.http.routers.wireguard-http.entrypoints=web"
+      - "traefik.http.routers.wireguard-http.middlewares=redirect-to-https"
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+      # HTTPS router — protégé par Authelia
+      - "traefik.http.routers.wireguard-https.rule=Host(vpn.lazyworkhorse.net)"
+      - "traefik.http.routers.wireguard-https.entrypoints=websecure"
+      - "traefik.http.routers.wireguard-https.tls=true"
+      - "traefik.http.routers.wireguard-https.tls.certresolver=njalla"
+      - "traefik.http.routers.wireguard-https.middlewares=wireguard-auth"
+
+      # Authelia forwardAuth
+      - "traefik.http.middlewares.wireguard-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
+      - "traefik.http.middlewares.wireguard-auth.forwardauth.trustforwardheader=true"
+      - "traefik.http.middlewares.wireguard-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
+
+      # Port interne du web UI wg-easy
+      - "traefik.http.services.wireguard.loadbalancer.server.port=51821"
 
 networks:
   vpn_net:
-    external: true
+    driver: bridge
     name: vpn_net