From dcc4ac9c10e14e10181ee419b23a8af2ed238dd1 Mon Sep 17 00:00:00 2001
From: poslop <bcb@airmail.cc>
Date: Tue, 16 Apr 2024 15:24:39 -0500
Subject: [PATCH] change permfix script

---
 docker-compose.yml | 45 ++++++++++++++++++++++++++++++++++-----------
 permfix            |  1 +
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 2aaec78..7caebab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,28 @@ networks:
     name: arr
 
 services:
+  gluetun:
+    image: ghcr.io/qdm12/gluetun
+    cap_add:
+      - NET_ADMIN
+    container_name: gluetun
+    environment:
+      - VPN_SERVICE_PROVIDER=mullvad
+      - VPN_TYPE=wireguard
+      - WIREGUARD_PRIVATE_KEY=+Jm+OLkBDUag9JrezhsNJy59qzCECI9uHl0QQtneolw=
+      - WIREGUARD_ADDRESSES=10.64.21.169/32
+      - SERVER_CITIES=Chicago IL
+        #- LOG_LEVEL=debug
+    volumes:
+      - gluetun:/gluetun
+    ports:
+      - 8181:8181
+      - 6881:6881
+      - 6881:6881/udp
+    restart: unless-stopped
+    networks:
+      - qbit
+
   syncthing:
     image: lscr.io/linuxserver/syncthing:latest
     container_name: syncthing
@@ -114,16 +136,16 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
       - WEBUI_PORT=8181
+    network_mode: "service:gluetun"
     volumes:
       - qbittorrent:/config
       - /mnt/nextcloud:/mnt/files
-    ports:
-      - 8181:8181
-      - 6881:6881
-      - 6881:6881/udp
     restart: unless-stopped
-    networks: 
-      - qbit
+    depends_on:
+      gluetun:
+        condition: service_healthy
+      #networks: 
+      #- qbit
 
   shoko:
     shm_size: 256m
@@ -171,6 +193,10 @@ services:
       - 18089:18089
       - 18083:18083
     command:
+      - "--add-priority-node=p2pmd.xmrvsbeast.com:18080"
+        #- "--add-priority-node=nodes.hashvault.pro:18080"
+      - "--out-peers=32"
+      - "--in-peers=64"
       - "--disable-dns-checkpoints"
       - "--rpc-restricted-bind-ip=0.0.0.0"
       - "--rpc-restricted-bind-port=18089"
@@ -350,9 +376,6 @@ volumes:
     name: ariang
   puffer-config:
     name: puffer-config
-    external: true
-  puffer-lib:
-    name: puffer-lib
   searxng:
     name: searxng
     external: true
@@ -365,7 +388,6 @@ volumes:
     external: true
   sonarr:
     name: sonarr
-    external: true
   prowlarr:
     name: prowlarr
     external: true
@@ -375,7 +397,6 @@ volumes:
     name: bitmonero
   p2pool-data:
     name: p2pool-data
-    external: true
   swag:
     name: swag
   syncdata:
@@ -385,3 +406,5 @@ volumes:
     name: librewolf-conf
   firefox:
     name: firefox
+  gluetun:
+    name: gluetun
diff --git a/permfix b/permfix
index 23b46ca..05efadb 100755
--- a/permfix
+++ b/permfix
@@ -1,3 +1,4 @@
 # Adds the group 1000 and then adds that group to user 33 to nextcloud container to fix permissions
 docker exec -it nextcloud-aio-nextcloud groupadd -g 1000 poslop
 docker exec -it nextcloud-aio-nextcloud usermod www-data -aG poslop
+docker exec -u 33 nextcloud-aio-nextcloud ./occ files:scan poslop