Refactor docker-compose files

vpn/docker-compose.yml

@@ -1,8 +1,8 @@
 version: '3.9'
+
 services:
     openvpn:
         image: kylemanna/openvpn
-        container_name: openvpn
         restart: unless-stopped
         volumes:
             - '/home/nick/configs/vpn/openvpn:/etc/openvpn'
@@ -11,14 +11,11 @@ services:
             - PGID=1000
         ports:
             - '1194:1194/udp'
-        networks:
-            - vpn
         cap_add:
             - NET_ADMIN
-
+            
     wireguard:
         image: weejewel/wg-easy
-        container_name: wireguard
         restart: unless-stopped
         volumes:
             - '/home/nick/configs/vpn/wireguard:/etc/wireguard'
@@ -28,8 +25,8 @@ services:
         ports:
             - '51820:51820/udp'
         networks:
-            - vpn
-            - proxy
+            - default
+            - routing
         cap_add:
             - NET_ADMIN
             - SYS_MODULE
@@ -37,29 +34,7 @@ services:
             - net.ipv4.ip_forward=1
             - net.ipv4.conf.all.src_valid_mark=1
 
-    tor:
-        image: dperson/torproxy
-        container_name: tor
-        restart: unless-stopped
-        environment:
-            - TZ=Europe/Athens
-            - USERID=1000
-            - GROUPID=1000
-        ports:
-            - '8118:8118'
-            - '9050:9050'
-        networks:
-            - tor
-
 networks:
-    vpn:
-        name: vpn
-        ipam:
-            driver: default
-            config:
-                - subnet: "172.20.0.0/16"
-    tor:
-        name: tor
-    proxy:
+    routing:
         external: true
-        name: proxy
+        name: routing