edited code design

docker-compose.yml

@@ -3,11 +3,11 @@ services:
     container_name: ca-lose-frontend
     hostname: lose-verkaufen
     build: ./frontend
+    depends_on:
+      - backend
     networks:
       ca-lose-internal:
         ipv4_address: 172.25.0.2
-      proxynet:
-        ipv4_address: 172.20.0.61
     restart: unless-stopped
 
   backend:
@@ -37,13 +37,11 @@ services:
       MYSQL_DATABASE: ca_lose
       TZ: Europe/Berlin
     volumes:
-      - ca-lose_mysql:/var/lib/mysql
+      - ../docker/volumes/ca-lose_mysql:/var/lib/mysql
       - ./mysql-timezone.cnf:/etc/mysql/conf.d/timezone.cnf:ro
     networks:
       ca-lose-internal:
         ipv4_address: 172.25.0.4
-      proxynet:
-        ipv4_address: 172.20.0.60
 
   # DNS Server für Hostname-Auflösung innerhalb des VPN
   dnsmasq:
@@ -59,10 +57,10 @@ services:
       --address=/frontend/172.25.0.2
       --address=/backend/172.25.0.3
       --address=/database/172.25.0.4
-      --address=/wg-admin/172.25.0.10
+      --address=/wireguard/172.25.0.6
     networks:
       ca-lose-internal:
-        ipv4_address: 172.25.0.53
+        ipv4_address: 172.25.0.5
 
   # WireGuard VPN mit Web-UI (wg-easy)
   wireguard:
@@ -75,34 +73,24 @@ services:
       LANG: de
       WG_HOST: dus3.the1s.de
       WG_PORT: "51830"
-      PORT: "51821"
+      WG_DEFAULT_DNS: "172.25.0.5"
-      WG_DEFAULT_ADDRESS: 10.14.14.x
+      PORT: "80" # Web-UI Port
-      WG_DEFAULT_DNS: "172.25.0.53"
+      PASSWORD_HASH: ${WIREGUARD_PASSWORD_HASH}
-      WG_ALLOWED_IPS: 172.25.0.0/24
-      WG_PERSISTENT_KEEPALIVE: "25"
-      WG_POST_UP: "iptables -t nat -A POSTROUTING -s 10.14.14.0/24 -o eth0 -j MASQUERADE; iptables -A FORWARD -i wg0 -o eth0 -j ACCEPT; iptables -A FORWARD -i eth0 -o wg0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -A FORWARD -i wg0 -d 172.25.0.2 -j ACCEPT; iptables -A FORWARD -i wg0 -d 172.25.0.53 -j ACCEPT; iptables -A FORWARD -i wg0 -j DROP"
-      WG_POST_DOWN: "iptables -t nat -D POSTROUTING -s 10.14.14.0/24 -o eth0 -j MASQUERADE; iptables -D FORWARD -i wg0 -o eth0 -j ACCEPT; iptables -D FORWARD -i eth0 -o wg0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -D FORWARD -i wg0 -d 172.25.0.2 -j ACCEPT; iptables -D FORWARD -i wg0 -d 172.25.0.53 -j ACCEPT; iptables -D FORWARD -i wg0 -j DROP"
     volumes:
-      - wireguard-data:/etc/wireguard
+      - ../docker/volumes/ca-lose-wireguard:/etc/wireguard
       - /lib/modules:/lib/modules:ro
     ports:
       - "51830:51830/udp"
+    # - "51831:80/tcp" # only for short configuration access - remove in production - external: 51831 internal: 80
     sysctls:
       - net.ipv4.ip_forward=1
       - net.ipv4.conf.all.src_valid_mark=1
     restart: unless-stopped
     depends_on:
       - dnsmasq
-      - frontend
     networks:
       ca-lose-internal:
-        ipv4_address: 172.25.0.10
+        ipv4_address: 172.25.0.6
-      proxynet:
-        ipv4_address: 172.20.0.50
-
-volumes:
-  ca-lose_mysql:
-  wireguard-data:
 
 networks:
   ca-lose-internal:
@@ -111,5 +99,3 @@ networks:
       config:
         - subnet: 172.25.0.0/24
           gateway: 172.25.0.1
-  proxynet:
-    external: true