Compare commits
2 Commits
fix/combin
...
feat/act-r
| Author | SHA1 | Date | |
|---|---|---|---|
| 670a2c47a1 | |||
| 946ebb2957 |
107
ai/compose.yml
Executable file → Normal file
107
ai/compose.yml
Executable file → Normal file
@@ -26,14 +26,8 @@ services:
|
|||||||
# - "traefik.http.routers.webui-https.tls.certresolver=njalla"
|
# - "traefik.http.routers.webui-https.tls.certresolver=njalla"
|
||||||
|
|
||||||
hermes:
|
hermes:
|
||||||
build:
|
build: ./hermes
|
||||||
context: ./hermes
|
|
||||||
ssh:
|
|
||||||
- default
|
|
||||||
container_name: hermes
|
container_name: hermes
|
||||||
entrypoint: ["/bin/bash", "-c",
|
|
||||||
"bash /opt/data/hermes-tools/install.sh && /opt/hermes/.venv/bin/uv pip install openai mautrix[encryption] --system -q && exec /usr/bin/tini -g -- /opt/hermes/docker/entrypoint.sh \"$@\"",
|
|
||||||
"hermes-entrypoint"]
|
|
||||||
restart: always
|
restart: always
|
||||||
# Gateway run enables the internal API server on port 8642
|
# Gateway run enables the internal API server on port 8642
|
||||||
command: gateway run
|
command: gateway run
|
||||||
@@ -44,7 +38,7 @@ services:
|
|||||||
- API_SERVER_HOST=0.0.0.0
|
- API_SERVER_HOST=0.0.0.0
|
||||||
- API_SERVER_KEY=hermes_local_key
|
- API_SERVER_KEY=hermes_local_key
|
||||||
- GATEWAY_ALLOW_ALL_USERS=true
|
- GATEWAY_ALLOW_ALL_USERS=true
|
||||||
- OPENROUTER_API_KEY=${OPEN...KEY}
|
- OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
|
||||||
# ROCm for GPU-accelerated faster-whisper STT
|
# ROCm for GPU-accelerated faster-whisper STT
|
||||||
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
- HSA_OVERRIDE_GFX_VERSION=9.0.6
|
||||||
- HCC_AMDGPU_TARGET=gfx906
|
- HCC_AMDGPU_TARGET=gfx906
|
||||||
@@ -54,12 +48,6 @@ services:
|
|||||||
- TZ=America/Montreal
|
- TZ=America/Montreal
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/data:/opt/data
|
- /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
|
|
||||||
# Persistent venv — Matrix bridge and other pip deps survive container rebuilds
|
|
||||||
- /mnt/HoardingCow_docker_data/Hermes/venv:/opt/hermes/.venv
|
|
||||||
devices:
|
devices:
|
||||||
- /dev/kfd:/dev/kfd
|
- /dev/kfd:/dev/kfd
|
||||||
- /dev/dri:/dev/dri
|
- /dev/dri:/dev/dri
|
||||||
@@ -69,35 +57,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- ai_backend
|
- ai_backend
|
||||||
|
|
||||||
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:
|
ollama:
|
||||||
build:
|
build:
|
||||||
context: ./ollama
|
context: ./ollama
|
||||||
@@ -131,62 +90,6 @@ services:
|
|||||||
- "303"
|
- "303"
|
||||||
- "26"
|
- "26"
|
||||||
|
|
||||||
paperclip-db:
|
|
||||||
image: postgres:17-alpine
|
|
||||||
container_name: paperclip-db
|
|
||||||
restart: always
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: paperclip
|
|
||||||
POSTGRES_PASSWORD: ${PAPERCLIP_DB_PASSWORD:?PAPERCLIP_DB_PASSWORD must be set}
|
|
||||||
POSTGRES_DB: paperclip
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U paperclip -d paperclip"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/pgdata:/var/lib/postgresql/data
|
|
||||||
networks:
|
|
||||||
- ai_backend
|
|
||||||
|
|
||||||
paperclip:
|
|
||||||
image: ghcr.io/paperclipai/paperclip:v2026.517.0
|
|
||||||
container_name: paperclip
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:3100:3100"
|
|
||||||
environment:
|
|
||||||
- HOST=0.0.0.0
|
|
||||||
- PORT=3100
|
|
||||||
- SERVE_UI=true
|
|
||||||
- DATABASE_URL=postgres://paperclip:***@paperclip-db:5432/paperclip
|
|
||||||
- BETTER_AUTH_SECRET=${PAPE...CRET must be set}
|
|
||||||
- PAPERCLIP_PUBLIC_URL=https://paperclip.lazyworkhorse.net
|
|
||||||
- PAPERCLIP_DEPLOYMENT_MODE=authenticated
|
|
||||||
- PAPERCLIP_DEPLOYMENT_EXPOSURE=private
|
|
||||||
volumes:
|
|
||||||
- /mnt/HoardingCow_docker_data/Paperclip/data:/paperclip
|
|
||||||
depends_on:
|
|
||||||
paperclip-db:
|
|
||||||
condition: service_healthy
|
|
||||||
networks:
|
|
||||||
- ai_net
|
|
||||||
- ai_backend
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
- "traefik.docker.network=ai_net"
|
|
||||||
|
|
||||||
- "traefik.http.routers.paperclip-http.rule=Host(`paperclip.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.paperclip-http.entrypoints=web"
|
|
||||||
- "traefik.http.routers.paperclip-http.middlewares=redirect-to-https"
|
|
||||||
|
|
||||||
- "traefik.http.routers.paperclip-https.rule=Host(`paperclip.lazyworkhorse.net`)"
|
|
||||||
- "traefik.http.routers.paperclip-https.entrypoints=websecure"
|
|
||||||
- "traefik.http.routers.paperclip-https.tls=true"
|
|
||||||
- "traefik.http.routers.paperclip-https.tls.certresolver=njalla"
|
|
||||||
|
|
||||||
- "traefik.http.services.paperclip.loadbalancer.server.port=3100"
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
ai_net:
|
ai_net:
|
||||||
external: true
|
external: true
|
||||||
@@ -338,8 +241,8 @@ networks:
|
|||||||
# - /home/gortium/infra:/data/workspace/infra
|
# - /home/gortium/infra:/data/workspace/infra
|
||||||
# environment:
|
# environment:
|
||||||
# - TZ=America/Toronto
|
# - TZ=America/Toronto
|
||||||
# - OPENCLAW_GATEWAY_TOKEN=${OPEN...KEN}
|
# - OPENCLAW_GATEWAY_TOKEN=${OPENCLAW_GATEWAY_TOKEN}
|
||||||
# - OPENROUTER_API_KEY=${OPEN...KEY}
|
# - OPENROUTER_API_KEY=${OPENROUTER_API_KEY}
|
||||||
# # Point to the sidecar browser
|
# # Point to the sidecar browser
|
||||||
# - BROWSER_CDP_URL=http://openclaw-browser:9222
|
# - BROWSER_CDP_URL=http://openclaw-browser:9222
|
||||||
# - BROWSER_EVALUATE_ENABLED=true
|
# - BROWSER_EVALUATE_ENABLED=true
|
||||||
@@ -384,7 +287,7 @@ networks:
|
|||||||
# - PGID=1000
|
# - PGID=1000
|
||||||
# - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
|
# - PUBLIC_KEY_FILE=/config/ssh/authorized_keys
|
||||||
# - SUDO_ACCESS=false
|
# - SUDO_ACCESS=false
|
||||||
# - PASSWORD_ACCESS=***
|
# - PASSWORD_ACCESS=false
|
||||||
# volumes:
|
# volumes:
|
||||||
# - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
|
# - /mnt/HoardingCow_docker_data/openclaw/ssh-config:/config
|
||||||
# - /home/gortium/infra:/data/workspace/infra:ro
|
# - /home/gortium/infra:/data/workspace/infra:ro
|
||||||
|
|||||||
@@ -1,59 +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
|
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 && \
|
|
||||||
rsync -a --delete fork/ /opt/hermes/ \
|
|
||||||
--exclude node_modules \
|
|
||||||
--exclude .venv \
|
|
||||||
--exclude .git && \
|
|
||||||
rm -rf /tmp/fork /root/.ssh/
|
|
||||||
|
|
||||||
# ---------- Rebuild web UI ----------
|
|
||||||
# Source files changed; node_modules (from base image) reused.
|
|
||||||
RUN cd /opt/hermes && npm run build
|
|
||||||
|
|
||||||
# ---------- 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
|
USER root
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
libportaudio2 ca-certificates poppler-utils imagemagick \
|
libportaudio2 \
|
||||||
texlive-latex-base texlive-latex-extra texlive-fonts-recommended \
|
ca-certificates \
|
||||||
texlive-xetex texlive-science \
|
poppler-utils \
|
||||||
qemu-user-static binfmt-support emacs-nox && \
|
imagemagick \
|
||||||
|
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/*
|
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/
|
||||||
|
|
||||||
# ---------- Piper TTS ----------
|
WORKDIR /opt/hermes
|
||||||
|
|
||||||
|
# ---------- 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 && \
|
RUN . /opt/hermes/.venv/bin/activate && \
|
||||||
uv pip install --no-cache-dir piper-tts sounddevice numpy && \
|
uv pip install --no-cache-dir piper-tts sounddevice numpy
|
||||||
mkdir -p /opt/hermes/.venv/share/piper/voices
|
|
||||||
|
|
||||||
RUN /opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
# ---------- Télécharger la voix Piper Ryan (high quality) ----------
|
||||||
|
RUN mkdir -p /opt/hermes/.venv/share/piper/voices && \
|
||||||
|
/opt/hermes/.venv/bin/python3 /dev/stdin << 'PYEOF'
|
||||||
import urllib.request
|
import urllib.request
|
||||||
base = '/opt/hermes/.venv/share/piper/voices'
|
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'
|
url = 'https://huggingface.co/rhasspy/piper-voices/resolve/main/en/en_US/ryan/high/en_US-ryan-high.onnx'
|
||||||
@@ -61,33 +52,22 @@ urllib.request.urlretrieve(url, base + '/en_US-ryan-high.onnx')
|
|||||||
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
urllib.request.urlretrieve(url + '.json', base + '/en_US-ryan-high.onnx.json')
|
||||||
PYEOF
|
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 himalaya-ro wrapper ----------
|
|
||||||
COPY --chmod=0755 himalaya-ro.sh /usr/local/bin/himalaya-ro
|
|
||||||
|
|
||||||
|
|
||||||
# ---------- Runtime ----------
|
# ---------- Runtime ----------
|
||||||
|
# Retour à l'utilisateur non-root pour la sécurité
|
||||||
USER hermes
|
USER hermes
|
||||||
|
|
||||||
ENV HERMES_HOME=/opt/data
|
ENV HERMES_HOME=/opt/data
|
||||||
ENV PATH="/opt/data/.local/bin:${PATH}"
|
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.
|
|
||||||
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" ]
|
||||||
|
|||||||
38
ai/hermes/fix-permissions.sh
Normal file
38
ai/hermes/fix-permissions.sh
Normal file
@@ -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 "$@"
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
# ─────────────────────────────────────────────────────────────
|
|
||||||
# himalaya-ro — Read-only wrapper for himalaya
|
|
||||||
#
|
|
||||||
# Blocks destructive commands and logs audit trail.
|
|
||||||
# Pass-through for read-only commands (list, read, search).
|
|
||||||
#
|
|
||||||
# Usage: himalaya-ro [options] <command> [args...]
|
|
||||||
#
|
|
||||||
# Install: place in PATH before the real himalaya, or use
|
|
||||||
# `ln -sf himalaya-ro /usr/local/bin/himalaya`
|
|
||||||
# ─────────────────────────────────────────────────────────────
|
|
||||||
set -o pipefail
|
|
||||||
|
|
||||||
# ── Configuration ───────────────────────────────────────────
|
|
||||||
HIMALAYA_BIN="${HIMALAYA_BIN:-/usr/local/bin/himalaya}"
|
|
||||||
AUDIT_LOG="${HIMALAYA_AUDIT_LOG:-/var/log/himalaya-audit.log}"
|
|
||||||
|
|
||||||
# ── Destructive commands we block ──────────────────────────
|
|
||||||
BLOCKED_CMDS=(
|
|
||||||
"message move"
|
|
||||||
"message delete"
|
|
||||||
"message copy"
|
|
||||||
"flag add"
|
|
||||||
"flag remove"
|
|
||||||
"folder create"
|
|
||||||
"folder delete"
|
|
||||||
"folder rename"
|
|
||||||
"template send"
|
|
||||||
"account configure"
|
|
||||||
"account delete"
|
|
||||||
)
|
|
||||||
|
|
||||||
# ── Determine the subcommand being invoked ─────────────────
|
|
||||||
# Strip leading options (--account, --output, etc.) to find the verb
|
|
||||||
ARGS=()
|
|
||||||
SKIP_NEXT=false
|
|
||||||
for arg in "$@"; do
|
|
||||||
if $SKIP_NEXT; then
|
|
||||||
SKIP_NEXT=false
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
if [[ "$arg" == --* ]]; then
|
|
||||||
case "$arg" in
|
|
||||||
--account|--output|--page|--page-size|--folder|--color|--format)
|
|
||||||
SKIP_NEXT=true ;;
|
|
||||||
esac
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
ARGS+=("$arg")
|
|
||||||
done
|
|
||||||
|
|
||||||
# Build subcommand string and check against blocklist
|
|
||||||
CMD_STR=""
|
|
||||||
for ((i=0; i<${#ARGS[@]}; i++)); do
|
|
||||||
if [ -z "$CMD_STR" ]; then
|
|
||||||
CMD_STR="${ARGS[$i]}"
|
|
||||||
else
|
|
||||||
CMD_STR="$CMD_STR ${ARGS[$i]}"
|
|
||||||
fi
|
|
||||||
for blocked in "${BLOCKED_CMDS[@]}"; do
|
|
||||||
if [[ "$CMD_STR" == "$blocked" ]]; then
|
|
||||||
TS=$(date '+%Y-%m-%d %H:%M:%S')
|
|
||||||
echo "[AUDIT] $TS BLOCKED: himalaya $*" >> "$AUDIT_LOG"
|
|
||||||
echo "ERROR: Command 'himalaya $CMD_STR ...' is blocked by read-only policy." >&2
|
|
||||||
echo " Audit log: $AUDIT_LOG" >&2
|
|
||||||
exit 100
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
# ── Allow pass-through ─────────────────────────────────────
|
|
||||||
exec "$HIMALAYA_BIN" "$@"
|
|
||||||
@@ -96,5 +96,5 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
backup_net:
|
backup_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: backup_net
|
name: backup_net
|
||||||
|
|||||||
@@ -82,37 +82,37 @@ networks:
|
|||||||
driver: bridge
|
driver: bridge
|
||||||
name: traefik_backend
|
name: traefik_backend
|
||||||
ai_net:
|
ai_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: ai_net
|
name: ai_net
|
||||||
auth_net:
|
auth_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: auth_net
|
name: auth_net
|
||||||
backup_net:
|
backup_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: backup_net
|
name: backup_net
|
||||||
cloud_net:
|
cloud_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: cloud_net
|
name: cloud_net
|
||||||
coms_net:
|
coms_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: coms_net
|
name: coms_net
|
||||||
finance_net:
|
finance_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: finance_net
|
name: finance_net
|
||||||
home_auto_net:
|
home_auto_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: home_auto_net
|
name: home_auto_net
|
||||||
homepage_net:
|
homepage_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: homepage_net
|
name: homepage_net
|
||||||
passman_net:
|
passman_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: passman_net
|
name: passman_net
|
||||||
tak_net:
|
tak_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: tak_net
|
name: tak_net
|
||||||
vc_net:
|
vc_net:
|
||||||
driver: bridge
|
external: true
|
||||||
name: vc_net
|
name: vc_net
|
||||||
|
|
||||||
# duckdns:
|
# duckdns:
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ services:
|
|||||||
- GITEA__actions__ENABLED=true
|
- GITEA__actions__ENABLED=true
|
||||||
- SSH_PORT=2222
|
- SSH_PORT=2222
|
||||||
- SSH_LISTEN_PORT=2222
|
- SSH_LISTEN_PORT=2222
|
||||||
# Enable Gitea Actions (act_runner required on host)
|
|
||||||
- GITEA__actions__ENABLED=true
|
|
||||||
volumes:
|
volumes:
|
||||||
- /mnt/HoardingCow_docker_data/Gitea:/data
|
- /mnt/HoardingCow_docker_data/Gitea:/data
|
||||||
networks:
|
networks:
|
||||||
@@ -47,7 +45,7 @@ services:
|
|||||||
image: gitea/act_runner:latest
|
image: gitea/act_runner:latest
|
||||||
container_name: act_runner
|
container_name: act_runner
|
||||||
environment:
|
environment:
|
||||||
- GITEA_INSTANCE_URL=https://code.lazyworkhorse.net
|
- GITEA_INSTANCE_URL=http://gitea:3000
|
||||||
- GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
|
- GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_TOKEN}
|
||||||
- GITEA_RUNNER_NAME=ai-host-runner
|
- GITEA_RUNNER_NAME=ai-host-runner
|
||||||
- GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
|
- GITEA_RUNNER_LABELS=ubuntu-latest:docker://catthehacker/ubuntu:full-22.04,nixos-builder:docker://nixos/nix
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -2,10 +2,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
wireguard:
|
wireguard:
|
||||||
build:
|
image: weejewel/wg-easy:latest
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
image: wg-easy-iptables-nft:latest
|
|
||||||
container_name: wireguard
|
container_name: wireguard
|
||||||
cap_add:
|
cap_add:
|
||||||
- NET_ADMIN
|
- NET_ADMIN
|
||||||
|
|||||||
Reference in New Issue
Block a user