From d051cd19f39f8108dfe994733b84605ba747168f Mon Sep 17 00:00:00 2001
From: ivan <egidarev.ie@dvfu.ru>
Date: Thu, 11 Sep 2025 18:30:53 +1000
Subject: [PATCH] edit volumes add jitsi

---
 global/docker-compose.yml | 90 +++++++++++----------------------------
 1 file changed, 26 insertions(+), 64 deletions(-)

diff --git a/global/docker-compose.yml b/global/docker-compose.yml
index 0a0c18b..b3e0f1b 100644
--- a/global/docker-compose.yml
+++ b/global/docker-compose.yml
@@ -1,4 +1,3 @@
-# docker‑compose.yml y(версия 3.8 – поддерживает named volumes и сетевые настройки)
 version: "3.8"
 
 networks:
@@ -12,6 +11,10 @@ networks:
     ipam:
       config:
         - subnet: 172.20.0.0/16
+          #  wg_net:
+          #    # Внешняявв сеть – интерфейс WireGuard
+          #    external: true
+          #    name: wg0
 
 services:
   synapse:
@@ -24,8 +27,8 @@ services:
       - SYNAPSE_REPORT_STATS=no
       - TZ=Asia/Vladivostok
     ports:
-      - "8008:8008"     # HTTP (без TLS), используемый 뒤 federation/client API
-      - "8448:8448"     # блок federation HTTPS (если понадобилось позже)
+      - "8008:8008"    
+      - "8448:8448"   
     volumes:
       - ./synapse/data:/data
       - ./mautrix:/briges
@@ -37,7 +40,7 @@ services:
       - npm
     container_name: drawio
     ports:
-      - "8280:8080"     # Draw.io в браузере: http://host:8080
+      - "8280:8080"     
     restart: unless-stopped
 
   apache:  
@@ -56,7 +59,7 @@ services:
     networks:
       - npm
     ports:
-      - "8282:80"       # простой статический nginx без монтирования – откроется дефолтный index
+      - "8282:80" 
     volumes:
       - ./nginx-site:/usr/share/nginx/html:ro
     restart: unless-stopped
@@ -64,25 +67,19 @@ services:
   npm-app:
     image: 'jc21/nginx-proxy-manager:latest'
     networks:
-      ollama_net:
-        ipv4_address: 172.28.0.100
-      npm:
+      - npm
     restart: unless-stopped
     ports:
-      # These ports are in format <host-port>:<container-port>
       - '80:80' # Public HTTP Port
       - '443:443' # Public HTTPS Port
       - '81:81' # Admin Web Port
-      # Add any other Stream port you want to expose
       # - '21:21' # FTP
     environment:
-      # Mysql/Maria connection parameters:
       DB_MYSQL_HOST: "docker-db-1"
       DB_MYSQL_PORT: 3306
       DB_MYSQL_USER: ${db_user}
       DB_MYSQL_PASSWORD: ${db_password}
       DB_MYSQL_NAME: "npm"
-      # Uncomment this if IPv6 is not enabled on your host
       # DISABLE_IPV6: 'true'
     volumes:
       - ./npm_data:/data
@@ -177,63 +174,28 @@ services:
       - 11434/tcp
     ports:
       - "11434:11434"
+    volumes:
+      - ./ollama:/root/.ollama/
     healthcheck:
       test: ollama --version || exit 1
         #entrypoint:  /root/entrypoint.sh
-        #environment:
-      #      - ENABLE_OLLAMA_STREAMING=false
-    volumes:
-      - ollama:/root/.ollama
-      - ./ollama/entrypoint.sh:/root/entrypoint.sh
 
-        #  ollama:
-        #    image: ollama/ollama:latest
-        #    container_name: ollama
-        #    networks:
-        #      ollama_net:
-        #        ipv4_address: 172.28.0.10
+
+        #  wireguard:
+        #    image: lscr.io/linuxserver/wireguard:latest
+        #    container_name: wireguard_vpn
+        #      #    networks:
+        #      #      - npm
+        #    cap_add:
+        #      - NET_ADMIN
+        #      - SYS_MODULE
+        #    sysctls:
+        #      - net.ipv4.conf.all.src_valid_mark=1
+        #    ports:
+        #      - "51820:51820/udp"
+        #    volumes:
+        #      - ./wireguard:/config
         #    restart: unless-stopped
-        #    volumes:
-        #      - ollama:/root/.ollama
-        #    ports:
-        #      - "11434:11434"
-        #    environment:
-        #      #      - OLLAMA_NUM_THREADS=8
-        #      - OLLAMA_NO_GPU=1 
-        #        #- OLLAMA_HOST=0.0.0.0
-
-        #  open-webui:
-        #    image: ghcr.io/open-webui/open-webui:main
-        #    container_name: open-webui
-        #    networks:
-        #      ollama_net:
-        #        ipv4_address: 172.28.0.20
-        #    ports:
-        #      - "8080:8080"
-        #    volumes:
-        #      - ./open-webui:/app/backend/data
-        #    environment:
-        #      - OLLAMA_BASE_URL=http://172.28.0.10:11434
-        #      - ENABLE_OLLAMA_STREAMING=true
-        #      - ENABLE_WEBSOCKET_SUPPORT=true
-        #      - GLOBAL_LOG_LEVEL=DEBUG
-        #    depends_on:
-        #      - ollama
-
-
-  wireguard:
-    image: lscr.io/linuxserver/wireguard:latest
-    container_name: wireguard_vpn
-    cap_add:
-      - NET_ADMIN
-      - SYS_MODULE
-    sysctls:
-      - net.ipv4.conf.all.src_valid_mark=1
-    ports:
-      - "51820:51820/udp"
-    volumes:
-      - ./wireguard:/config
-    restart: unless-stopped
 
 volumes:
   synapse_data: