Merge remote-tracking branch 'origin/feat/wireguard-vpn' into HEAD

ai/Dockerfile

@@ -21,8 +21,7 @@ RUN apt-get update && \
         texlive-latex-base texlive-latex-extra texlive-fonts-recommended texlive-xetex texlive-science \
         qemu-user-static binfmt-support qemu-user-binfmt \
         emacs-nox \
-        libportaudio2 \
+        libportaudio2 && \
-        wireguard-tools openresolv && \
     rm -rf /var/lib/apt/lists/*
 
 # Non-root user for runtime; UID can be overridden via HERMES_UID at runtime

ai/compose.yml

@@ -1,32 +1,32 @@
 version: "3.8"
 services:
 
-  webui:
+  # webui:
-    image: ghcr.io/open-webui/open-webui:main
+  #   image: ghcr.io/open-webui/open-webui:main
-    volumes:
+  #   volumes:
-      - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
+  #     - /mnt/HoardingCow_docker_data/Ollama/open-webui:/app/backend/data
-    restart: always
+  #   restart: always
-    environment:
+  #   environment:
-      - OLLAMA_API_BASE_URL=http://ollama:11434/api
+  #     - OLLAMA_API_BASE_URL=http://ollama:11434/api
-    networks:
+  #   networks:
-      - ai_net
+  #     - ai_net
-      - ai_backend
+  #     - ai_backend
-    labels:
+  #   labels:
-      - "traefik.enable=true"
+  #     - "traefik.enable=true"
 
-      # Router for HTTP + redirection to HTTPS
+  #     # Router for HTTP + redirection to HTTPS
-      - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-http.rule=Host(`ai.lazyworkhorse.net`)"
-      - "traefik.http.routers.webui-http.entrypoints=web"
+  #     - "traefik.http.routers.webui-http.entrypoints=web"
-      - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
+  #     - "traefik.http.routers.webui-http.middlewares=redirect-to-https"
 
-      # Router for HTTPS with TLS
+  #     # Router for HTTPS with TLS
-      - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
+  #     - "traefik.http.routers.webui-https.rule=Host(`ai.lazyworkhorse.net`)"
-      - "traefik.http.routers.webui-https.entrypoints=websecure"
+  #     - "traefik.http.routers.webui-https.entrypoints=websecure"
-      - "traefik.http.routers.webui-https.tls=true"
+  #     - "traefik.http.routers.webui-https.tls=true"
-      - "traefik.http.routers.webui-https.tls.certresolver=njalla"
+  #     - "traefik.http.routers.webui-https.tls.certresolver=njalla"
 
   hermes:
-    image: nousresearch/hermes-agent:latest
+    build: ./
     container_name: hermes
     restart: always
     # Gateway run enables the internal API server on port 8642

coms/compose.yml

@@ -1,15 +1,15 @@
 version: "3.9"
 services:
-  nomadnet:
+  # nomadnet:
-    image: ghcr.io/markqvist/nomadnet:master
+  #   image: ghcr.io/markqvist/nomadnet:master
-    container_name: nomadnet
+  #   container_name: nomadnet
-    restart: always
+  #   restart: always
-    volumes:
+  #   volumes:
-      - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
+  #     - /mnt/HoardingCow_docker_data/Nomadnet:/root/.nomadnetwork
-      - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
+  #     - /mnt/HoardingCow_docker_data/Reticulum:/root/.reticulum
-    # Reticulum transport must be reachable directly (NOT through Traefik)
+  #   # Reticulum transport must be reachable directly (NOT through Traefik)
-    ports:
+  #   ports:
-      - "4242:4242"
+  #     - "4242:4242"
 
   synapse:
     image: ghcr.io/element-hq/synapse:latest