Gitea runner fixes

.gitignore

@@ -1,13 +0,0 @@
-# Temp/scratch files — never commit these
-*.bak
-*.swp
-*.tmp
-*~
-scratch/
-.env
-.env.local
-tmp/
-temp/
-replace_compose.py
-entrypoint-*.sh
-copy_*.txt

ai/compose.yml

@@ -26,24 +26,13 @@ services:
   #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
 
   hermes:
-    build:
+    build: ./hermes
-      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
     environment:
       - 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.
-      # Add profiles here when they exist on disk (e.g. default,researcher,writer)
-      - HERMES_PROFILES=ashley,claire,finn,matt,paul
       - API_SERVER_ENABLED=true
       - API_SERVER_PORT=8642
       - API_SERVER_HOST=0.0.0.0
@@ -59,10 +48,6 @@ 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
     devices:
       - /dev/kfd:/dev/kfd
       - /dev/dri:/dev/dri
@@ -71,59 +56,6 @@ services:
       - "26"
     networks:
       - ai_backend
-      - ai_net
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=ai_net"
-
-      # Router for HTTP + redirection to HTTPS
-      - "traefik.http.routers.hermes-web-http.rule=Host(`hermes.lazyworkhorse.net`)"
-      - "traefik.http.routers.hermes-web-http.entrypoints=web"
-      - "traefik.http.routers.hermes-web-http.middlewares=redirect-to-https"
-
-      # Router for HTTPS with TLS — protected by Authelia
-      - "traefik.http.routers.hermes-web-https.rule=Host(`hermes.lazyworkhorse.net`)"
-      - "traefik.http.routers.hermes-web-https.entrypoints=websecure"
-      - "traefik.http.routers.hermes-web-https.tls=true"
-      - "traefik.http.routers.hermes-web-https.tls.certresolver=njalla"
-      - "traefik.http.routers.hermes-web-https.middlewares=hermes-auth"
-
-      # Authelia forwardAuth
-      - "traefik.http.middlewares.hermes-auth.forwardauth.address=http://authelia:9091/api/verify?rd=https://auth.lazyworkhorse.net/"
-      - "traefik.http.middlewares.hermes-auth.forwardauth.trustforwardheader=true"
-      - "traefik.http.middlewares.hermes-auth.forwardauth.authresponseheaders=X-Forwarded-User,X-Forwarded-Groups"
-
-      # Service Loadbalancer (dashboard port 9119)
-      - "traefik.http.services.hermes-web.loadbalancer.server.port=9119"
-
-  syncthing:
-    image: syncthing/syncthing:latest
-    container_name: syncthing
-    hostname: syncthing
-    restart: always
-    ports:
-      - "8384:8384"
-      - "22000:22000"
-      - "21027:21027/udp"
-    environment:
-      - TZ=America/Montreal
-    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
-    networks:
-      - ai_backend
-      - ai_net
-    labels:
-      - "traefik.enable=true"
-      - "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"
 
   ollama:
     build:

ai/hermes/Dockerfile

@@ -1,60 +1,50 @@
-# syntax=docker/dockerfile:1
+# 1. On récupère la version la plus récente d'UV
-# Hermes Agent -- custom fork build
+FROM ghcr.io/astral-sh/uv:latest AS uv_source
-# Builds on top of official image + overlays our forked source from Gitea.
-# Requires Docker BuildKit. Pass SSH agent for git clone:
-#   docker compose build hermes
-# Or manually:
-#   DOCKER_BUILDKIT=1 docker build --ssh default -t hermes-agent:custom .
 
-# ---------- Base: official Hermes image (system deps, npm, uv, Playwright) ----------
+# 2. Image officielle Hermes Agent de NousResearch
+# Contient déjà: Python, Node.js, npm, Playwright/Chromium, venv, tts_tool.py, etc.
 FROM nousresearch/hermes-agent:latest
 
-# ---------- Overlay our forked source ----------
+# ---------- System dependencies ----------
-# Uses SSH agent forwarding from the build host (no key baked into image).
+# The official hermes-agent image already has: git, curl, ffmpeg, python3,
-# --exclude node_modules/.venv keeps the base image's pre-built layers intact.
+# gcc, build-essential, openssh-client, procps, tini, ripgrep, docker-cli,
-# Only the Python source, web UI source, and config change.
+# libportaudio2, ca-certificates, etc.
-RUN --mount=type=ssh \
+#
-    mkdir -p /root/.ssh && \
+# These extras we need to add back:
-    ssh-keyscan -p 2222 code.lazyworkhorse.net >> /root/.ssh/known_hosts 2>/dev/null && \
+#   - poppler-utils, imagemagick  (PDF/image processing)
-    cd /tmp && \
+#   - texlive-*                   (LaTeX typesetting for reports)
-    GIT_SSH_COMMAND='ssh -p 2222 -o StrictHostKeyChecking=no' \
+#   - qemu-user-static, binfmt-support (QEMU cross-compilation)
-    git clone --depth 1 --branch main \
+#   - emacs-nox                   (text editing in container)
-    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 && \
     apt-get install -y --no-install-recommends \
-        libportaudio2 ca-certificates poppler-utils imagemagick \
+        libportaudio2 \
-        libolm-dev \
+        ca-certificates \
-        texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
+        poppler-utils \
-        texlive-xetex texlive-science \
+        imagemagick \
-        qemu-user-static binfmt-support emacs-nox && \
+        texlive-latex-base \
+        texlive-latex-extra \
+        texlive-fonts-recommended \
+        texlive-xetex \
+        texlive-science \
+        qemu-user-static \
+        binfmt-support \
+        emacs-nox && \
     rm -rf /var/lib/apt/lists/*
 
-# ---------- UV ----------
+# ---------- UV (hyperfast pip alternative) ----------
-COPY --chmod=0755 --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/
+COPY --chmod=0755 --from=uv_source /uv /usr/local/bin/
 
-# ---------- Matrix bridge + extra pip deps ----------
+WORKDIR /opt/hermes
-# 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.
+# ---------- Piper TTS dans le venv existant ----------
+# Le venv de l'image de base est root-owned, on doit installer en root aussi
 RUN . /opt/hermes/.venv/bin/activate && \
-    uv pip install --no-cache-dir 'mautrix[encryption]' openai
+    uv pip install --no-cache-dir piper-tts sounddevice numpy
 
-# ---------- Piper TTS ----------
+# ---------- Télécharger la voix Piper Ryan (high quality) ----------
-RUN . /opt/hermes/.venv/bin/activate && \
+RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
-    uv pip install --no-cache-dir piper-tts sounddevice numpy && \
+    /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
-    mkdir -p /opt/hermes/.venv/share/piper/voices
-
-RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
 import urllib.request
 base = '/opt/hermes/.venv/share/piper/voices'
 url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
@@ -62,34 +52,22 @@ urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
 urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
 PYEOF
 
-# ---------- Install Himalaya email CLI ----------
+# ---------- Patch tts_tool.py: remplacer Edge TTS par Piper ----------
-RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
+# Edge TTS appelle les serveurs Microsoft — on ne veut jamais ça.
-import urllib.request, tarfile, os, shutil
+# Piper roule localement sur CPU, aucun cloud, aucune donnée qui sort.
-url = 'https://github.com/pimalaya/himalaya/releases/download/v1.2.0/himalaya.x86_64-linux.tgz'
+COPY patch_tts_tool.py /tmp/patch_tts_tool.py
-tgz = '/tmp/himalaya.tgz'
+RUN /opt/hermes/.venv/bin/python3 /tmp/patch_tts_tool.py && rm /tmp/patch_tts_tool.py
-urllib.request.urlretrieve(url, tgz)
-with tarfile.open(tgz) as t:
-    t.extractall('/tmp')
-shutil.move('/tmp/himalaya', '/usr/local/bin/himalaya')
-os.chmod('/usr/local/bin/himalaya', 0o755)
-os.remove(tgz)
-print('himalaya v1.2.0 installed')
-PYEOF
-
-# ---------- Install multi-gateway launcher ----------
-# Launches one gateway process per profile (HERMES_PROFILES env var)
-COPY --chmod=0755 run-multi-gateways.sh /usr/local/bin/run-multi-gateways.sh
 
 # ---------- Runtime ----------
+# Retour à l'utilisateur non-root pour la sécurité
 USER hermes
+
 ENV HERMES_HOME=/opt/data
 ENV PATH="/opt/data/.local/bin:${PATH}"
-# Point browser tool to Playwright's Chromium (already in base image)
-ENV CHROME_EXECUTABLE=/opt/hermes/.playwright/chromium/chrome-linux/chrome
 
-# Ensure tools directory and toolsets.py are writable by the hermes runtime user
+VOLUME [ "/opt/data" ]
-# so custom tools can be injected from the persistent volume at startup.
-USER root
-RUN chown -R hermes:hermes /opt/hermes/tools /opt/hermes/toolsets.py
 
-VOLUME [ "/opt/data" ]
+# Script de réparation des permissions + patch TTS au démarrage
+COPY --chmod=0755 fix-permissions.sh /opt/hermes/fix-permissions.sh
+
+ENTRYPOINT [ "/usr/bin/tini", "-g", "--", "/opt/hermes/fix-permissions.sh" ]

ai/hermes/fix-permissions.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+# Startup permission fix + TTS patch.
+# Runs as root before the entrypoint drops to the hermes user.
+set -e
+
+HERMES_HOME="${HERMES_HOME:-/opt/data}"
+
+# Fix ownership on critical writable directories
+chown -R hermes:hermes \
+  "$HERMES_HOME/sessions" \
+  "$HERMES_HOME/checkpoints" \
+  "$HERMES_HOME/skills" \
+  "$HERMES_HOME/memories" \
+  "$HERMES_HOME/workspace" \
+  "$HERMES_HOME/pastes" \
+  "$HERMES_HOME/logs" \
+  "$HERMES_HOME/cron" \
+  "$HERMES_HOME/plans" \
+  "$HERMES_HOME/hooks" \
+  "$HERMES_HOME/cache" \
+  2>/dev/null || true
+
+# Fix data volume root ownership
+if [ "$(stat -c %u "$HERMES_HOME" 2>/dev/null)" != "$(id -u hermes)" ]; then
+  chown hermes:hermes "$HERMES_HOME" 2>/dev/null || true
+fi
+
+# ---------- Patch tts_tool.py: replace Edge TTS with Piper ----------
+# Fallback runtime patch in case the volume's site-packages differ from the image.
+# Idempotent: if already patched, the script does nothing.
+PATCH_SCRIPT="/opt/hermes/patch_tts_tool.py"
+if [ -f "$PATCH_SCRIPT" ]; then
+  echo "Applying TTS patch (Piper only, no Edge fallback)..."
+  /opt/hermes/.venv/bin/python3 "$PATCH_SCRIPT" 2>&1 || true
+fi
+
+# Chain to the official Hermes entrypoint
+exec /opt/hermes/docker/entrypoint.sh "$@"

ai/hermes/run-multi-gateways.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-# Multi-gateway launcher for HERMES_PROFILES env var.
-# Reads comma-separated profile names, spawns one gateway per profile.
-# Designed to run before the main entrypoint — gateways run in background.
-set -e
-
-if [ -z "${HERMES_PROFILES}" ]; then
-  echo "HERMES_PROFILES not set — skipping multi-gateway launch"
-  exit 0
-fi
-
-# Source venv to make 'hermes' available (entrypoint.sh sources it later,
-# but we need it NOW for the background gateways)
-HERMES_BIN="/opt/hermes/.venv/bin/hermes"
-if [ ! -x "$HERMES_BIN" ]; then
-  echo "ERROR: hermes binary not found at $HERMES_BIN"
-  exit 1
-fi
-
-mkdir -p /opt/data/logs
-
-IFS=',' read -ra PROFILES <<< "${HERMES_PROFILES}"
-for profile in "${PROFILES[@]}"; do
-  profile="$(echo "${profile}" | xargs)"  # trim whitespace
-  [ -z "${profile}" ] && continue
-
-  echo "Starting gateway for profile: ${profile}"
-  nohup env API_SERVER_ENABLED=false API_SERVER_KEY= gosu hermes "$HERMES_BIN" --profile "${profile}" gateway run \
-      >> "/opt/data/logs/gateway-${profile}.log" 2>&1 &
-done
-
-echo "All gateways launched: ${HERMES_PROFILES}"

int/.env.example

@@ -1,53 +0,0 @@
-# =============================================================================
-# WorldMonitor — Environment Variables
-# =============================================================================
-# Copy this file to .env (gitignored) and fill in your keys.
-# All keys are optional — the dashboard works without them,
-# but the corresponding features will be disabled.
-#
-# Usage:
-#   cp .env.example .env.local   (docker-compose auto-loads .env from CWD)
-#
-# For production secrets, add these to the shared containers.env
-# agenix secret at: secrets/containers.env.age
-# =============================================================================
-
-# ── REQUIRED: These containers refuse to start without them ──
-# Generate with: openssl rand -hex 32
-REDIS_PASSWORD=
-REDIS_TOKEN=
-RELAY_SHARED_SECRET=
-
-# ── LLM / AI (for intelligence assessments) ──
-# Pick one or both
-GROQ_API_KEY=               # https://console.groq.com (free: 14,400 req/day)
-OPENROUTER_API_KEY=         # https://openrouter.ai (free: 50 req/day)
-
-# ── Markets & Economics (optional) ──
-FINNHUB_API_KEY=            # https://finnhub.io (free tier)
-FRED_API_KEY=               # https://fred.stlouisfed.org (free)
-EIA_API_KEY=                # https://www.eia.gov/opendata/ (free)
-
-# ── Aviation (optional) ──
-AVIATIONSTACK_API=          # https://aviationstack.com (free tier)
-WINGBITS_API_KEY=           # https://wingbits.com (contact them)
-
-# ── Maritime (optional) ──
-AISSTREAM_API_KEY=          # https://aisstream.io (free tier)
-
-# ── Conflict & Unrest (optional) ──
-ACLED_ACCESS_TOKEN=         # https://acleddata.com (free for researchers)
-
-# ── Earth Observation (optional) ──
-NASA_FIRMS_API_KEY=         # https://firms.modaps.eosdis.nasa.gov (free)
-
-# ── Infrastructure / Internet (optional) ──
-CLOUDFLARE_API_TOKEN=       # https://developers.cloudflare.com/fundamentals/api/
-
-# ── Port (optional, defaults to 3000) ──
-WM_PORT=3000
-
-# ── Convex (for cloud sync / auth — optional for self-host) ──
-CONVEX_URL=
-CLERK_SECRET_KEY=
-VITE_CLERK_PUBLISHABLE_KEY=

int/compose.yml

@@ -1,177 +0,0 @@
-# =============================================================================
-# Integrations stack
-# =============================================================================
-# Currently running: WorldMonitor
-# Planned: TAK server (commented out — needs fixing)
-# =============================================================================
-
-# ── TAK Server (FreeTAKServer) ──
-# Disabled: needs debugging. Was having connectivity/auth issues.
-# See: https://github.com/FreeTAKTeam/FreeTAKServer
-#
-# services:
-#   freetakserver:
-#     image: ghcr.io/freetakteam/freetakserver:master
-#     container_name: freetakserver
-#     hostname: freetakserver
-#     restart: always
-#     networks:
-#       - int_backend
-#     volumes:
-#       - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
-#     ports:
-#       - 8087:8087
-#       - 8089:8089
-#       - 8443:8443
-#       - 9000:9000
-#       - 19023:19023
-#     environment:
-#       FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
-#       FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
-#       FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
-#       FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
-#       FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
-#       FTS_COT_PORT: 8087
-#       FTS_SSLCOT_PORT: 8089
-#       FTS_API_PORT: 19023
-#       FTS_FED_PORT: 9000
-#       FTS_DP_ADDRESS: 'freetakserver'
-#       FTS_USER_ADDRESS: 'freetakserver'
-#       FTS_API_ADDRESS: 'freetakserver'
-#       FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
-#       FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
-#       FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
-#       FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
-#       FTS_ROUTING_PROXY_SERVER_PORT: 19031
-#       FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
-#       FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
-#       FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
-#       FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
-#       FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
-#       FTS_OPTIMIZE_API: "True"
-#       FTS_DATA_RECEPTION_BUFFER: 1024
-#       FTS_MAX_RECEPTION_TIME: 4
-#       FTS_NUM_ROUTING_WORKERS: 3
-#       FTS_COT_TO_DB: "True"
-#       FTS_MAINLOOP_DELAY: 100
-#       FTS_EMERGENCY_RADIUS: 0
-#       FTS_LOG_LEVEL: "info"
-#
-#   freetakserver-ui:
-#     image: ghcr.io/freetakteam/ui:latest
-#     container_name: freetakserver-ui
-#     hostname: freetakserver-ui
-#     restart: always
-#     networks:
-#       - int_net
-#     ports:
-#       - 5000:5000
-#     volumes:
-#       - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
-#     environment:
-#       FTS_IP: "freetakserver" 
-#       FTS_API_PORT: 19023
-#       FTS_API_PROTO: 'http'
-#       FTS_UI_EXPOSED_IP: 'freetakserver-ui'
-#       FTS_MAP_EXPOSED_IP: '127.0.0.1'
-#       FTS_MAP_PORT: 8000
-#       FTS_MAP_PROTO: 'http'
-#       FTS_UI_PORT: 5000
-#       FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
-#       FTS_API_KEY: 'Bearer token'
-#       FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
-#     labels:
-#       - "traefik.enable=true"
-#       - "traefik.docker.network=traefik-net"
-#       - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
-#       - "traefik.http.routers.fts-ui-http.entrypoints=web"
-#       - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
-#       - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
-#       - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
-#       - "traefik.http.routers.fts-ui-https.tls=true"
-#       - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
-#       - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
-#       - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
-
-# ── WorldMonitor ──
-# Real-time global intelligence dashboard
-# Repo: https://github.com/koala73/worldmonitor
-# Self-hosted, map-first OSINT with MCP support (39 tools)
-services:
-
-  worldmonitor:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: Dockerfile
-    image: worldmonitor:latest
-    container_name: worldmonitor
-    ports:
-      - "${WM_PORT:-3000}:8080"
-    environment:
-      UPSTASH_REDIS_REST_URL: "http://redis-rest:80"
-      UPSTASH_REDIS_REST_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
-      LOCAL_API_PORT: "46123"
-      LOCAL_API_MODE: "docker"
-      LOCAL_API_CLOUD_FALLBACK: "false"
-      WS_RELAY_URL: "http://ais-relay:3004"
-      # LLM providers (optional — features degrade gracefully)
-      LLM_API_URL: "${LLM_API_URL:-}"
-      LLM_API_KEY: "${LLM_API_KEY:-}"
-      LLM_MODEL: "${LLM_MODEL:-}"
-      GROQ_API_KEY: "${GROQ_API_KEY:-}"
-      # Data source API keys (optional — features degrade gracefully)
-      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
-      FINNHUB_API_KEY: "${FINNHUB_API_KEY:-}"
-      EIA_API_KEY: "${EIA_API_KEY:-}"
-      FRED_API_KEY: "${FRED_API_KEY:-}"
-      ACLED_ACCESS_TOKEN: "${ACLED_ACCESS_TOKEN:-}"
-      NASA_FIRMS_API_KEY: "${NASA_FIRMS_API_KEY:-}"
-      CLOUDFLARE_API_TOKEN: "${CLOUDFLARE_API_TOKEN:-}"
-      AVIATIONSTACK_API: "${AVIATIONSTACK_API:-}"
-    depends_on:
-      redis-rest:
-        condition: service_started
-      ais-relay:
-        condition: service_started
-    restart: unless-stopped
-
-  ais-relay:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: Dockerfile.relay
-    image: worldmonitor-ais-relay:latest
-    container_name: worldmonitor-ais-relay
-    environment:
-      AISSTREAM_API_KEY: "${AISSTREAM_API_KEY:-}"
-      PORT: "3004"
-    restart: unless-stopped
-
-  redis:
-    image: docker.io/redis:7-alpine
-    container_name: worldmonitor-redis
-    command: >
-      redis-server
-      --requirepass "${REDIS_PASSWORD:?REDIS_PASSWORD required}"
-      --maxmemory 256mb
-      --maxmemory-policy allkeys-lru
-    volumes:
-      - wm-redis-data:/data
-    restart: unless-stopped
-
-  redis-rest:
-    build:
-      context: https://github.com/koala73/worldmonitor.git
-      dockerfile: docker/Dockerfile.redis-rest
-    image: worldmonitor-redis-rest:latest
-    container_name: worldmonitor-redis-rest
-    ports:
-      - "127.0.0.1:8079:80"
-    environment:
-      SRH_TOKEN: "${REDIS_TOKEN:?REDIS_TOKEN required}"
-      SRH_CONNECTION_STRING: "redis://:${REDIS_PASSWORD:?REDIS_PASSWORD required}@redis:6379"
-    depends_on:
-      - redis
-    restart: unless-stopped
-
-volumes:
-  wm-redis-data:

tak/compose.yml

@@ -0,0 +1,98 @@
+services:
+  freetakserver:
+    image: ghcr.io/freetakteam/freetakserver:master
+    container_name: freetakserver
+    hostname: freetakserver
+    restart: always
+    networks:
+      - tak_backend
+    volumes:
+      - /mnt/HoardingCow_docker_data/TAK/fts_data:/opt/fts:z,rw
+    ports:
+      - 8087:8087
+      - 8089:8089
+      - 8443:8443
+      - 9000:9000
+      - 19023:19023
+    environment:
+      FTS_FED_PASSWORD: "${FTS_FED_PASSWORD}"
+      FTS_CLIENT_CERT_PASSWORD: "${FTS_CLIENT_CERT_PASSWORD}"
+      FTS_WEBSOCKET_KEY: "${FTS_WEBSOCKET_KEY}"
+      FTS_SECRET_KEY: "${FTS_SECRET_KEY}"
+      FTS_CONNECTION_MESSAGE: "Welcome to FreeTAKServer. The Parrot is not dead. It's just resting"
+      FTS_COT_PORT: 8087
+      FTS_SSLCOT_PORT: 8089
+      FTS_API_PORT: 19023
+      FTS_FED_PORT: 9000
+      FTS_DP_ADDRESS: 'freetakserver'
+      FTS_USER_ADDRESS: 'freetakserver'
+      FTS_API_ADDRESS: 'freetakserver'
+      FTS_ROUTING_PROXY_SUBSCRIBE_PORT: 19030
+      FTS_ROUTING_PROXY_SUBSCRIBE_IP: 'freetakserver'
+      FTS_ROUTING_PROXY_PUBLISHER_PORT: 19032
+      FTS_ROUTING_PROXY_PUBLISHER_IP: 'freetakserver'
+      FTS_ROUTING_PROXY_SERVER_PORT: 19031
+      FTS_ROUTING_PROXY_SERVER_IP: 'freetakserver'
+      FTS_INTEGRATION_MANAGER_PULLER_PORT: 19033
+      FTS_INTEGRATION_MANAGER_PULLER_ADDRESS: 'freetakserver'
+      FTS_INTEGRATION_MANAGER_PUBLISHER_PORT: 19034
+      FTS_INTEGRATION_MANAGER_PUBLISHER_ADDRESS: 'freetakserver'
+      FTS_OPTIMIZE_API: "True"
+      FTS_DATA_RECEPTION_BUFFER: 1024
+      FTS_MAX_RECEPTION_TIME: 4
+      FTS_NUM_ROUTING_WORKERS: 3
+      FTS_COT_TO_DB: "True"
+      FTS_MAINLOOP_DELAY: 100
+      FTS_EMERGENCY_RADIUS: 0
+      FTS_LOG_LEVEL: "info"
+
+  freetakserver-ui:
+    image: ghcr.io/freetakteam/ui:latest
+    container_name: freetakserver-ui
+    hostname: freetakserver-ui
+    restart: always
+    networks:
+      - tak_net
+    ports:
+      - 5000:5000
+    volumes:
+      - /mnt/HoardingCow_docker_data/TAK/fts_ui_data:/home/freetak/data:z,rw
+    environment:
+      FTS_IP: "freetakserver" 
+      FTS_API_PORT: 19023
+      FTS_API_PROTO: 'http'
+      FTS_UI_EXPOSED_IP: 'freetakserver-ui'
+      FTS_MAP_EXPOSED_IP: '127.0.0.1'
+      FTS_MAP_PORT: 8000
+      FTS_MAP_PROTO: 'http'
+      FTS_UI_PORT: 5000
+      FTS_UI_WSKEY: "${FTS_WEBSOCKET_KEY}"
+      FTS_API_KEY: 'Bearer token'
+      FTS_UI_SQLALCHEMY_DATABASE_URI: 'sqlite:////home/freetak/data/FTSServer-UI.db'
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=traefik-net"
+
+      # HTTP -> HTTPS Redirect
+      - "traefik.http.routers.fts-ui-http.rule=Host(`tak.lazyworkhorse.net`)"
+      - "traefik.http.routers.fts-ui-http.entrypoints=web"
+      - "traefik.http.routers.fts-ui-http.middlewares=redirect-to-https"
+
+      # HTTPS Router
+      - "traefik.http.routers.fts-ui-https.rule=Host(`tak.lazyworkhorse.net`)"
+      - "traefik.http.routers.fts-ui-https.entrypoints=websecure"
+      - "traefik.http.routers.fts-ui-https.tls=true"
+      - "traefik.http.routers.fts-ui-https.tls.certresolver=njalla"
+      
+      # Service & Port
+      - "traefik.http.services.fts-ui.loadbalancer.server.port=5000"
+
+      # Reuse your existing redirect middleware
+      - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
+
+networks:
+  tak_net:
+    external: true
+  tak_backend:
+    driver: bridge
+    name: tak_backend

versioncontrol/compose.yml

@@ -10,8 +10,6 @@ services:
       - GITEA__actions__ENABLED=true
       - SSH_PORT=2222
       - SSH_LISTEN_PORT=2222
-      # Enable Gitea Actions (act_runner required on host)
-      - GITEA__actions__ENABLED=true
     volumes:
       - /mnt/HoardingCow_docker_data/Gitea:/data
     networks:
@@ -47,7 +45,7 @@ services:
     image: gitea/act_runner:latest
     container_name: act_runner
     environment:
-      - GITEA_INSTANCE_URL=https://code.lazyworkhorse.net
+      - GITEA_INSTANCE_URL=http://gitea:3000
       - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
       - GITEA_RUNNER_NAME=ai-host-runner
       - GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix

vpn/Dockerfile

@@ -1,9 +0,0 @@
-# Custom wg-easy with iptables-nft (nftables-backed iptables)
-# Fixes crash-loop when host kernel lacks legacy iptable_nat module.
-FROM ghcr.io/wg-easy/wg-easy:latest
-
-# The upstream image registers only iptables-legacy with update-alternatives.
-# iptables-nft binary exists but isn't registered as an alternative key.
-# Override the alternatives-managed symlinks directly.
-RUN ln -sf /usr/sbin/iptables-nft /usr/sbin/iptables && \
-    ln -sf /usr/sbin/ip6tables-nft /usr/sbin/ip6tables

vpn/compose.yml

@@ -2,10 +2,7 @@ version: "3.8"
 
 services:
   wireguard:
-    build:
+    image: weejewel/wg-easy:latest
-      context: .
-      dockerfile: Dockerfile
-    image: wg-easy-iptables-nft:latest
     container_name: wireguard
     cap_add:
       - NET_ADMIN