Merge branch 'dev' into prod

docker-compose.prod.yml

@@ -50,35 +50,33 @@ services:
 
   wireguard:
     image: lscr.io/linuxserver/wireguard:latest
-    container_name: ca-lose-wireguard
+    container_name: wireguard
     cap_add:
       - NET_ADMIN
-      - SYS_MODULE
+      - SYS_MODULE #optional
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/Berlin
-      - SERVERURL=dus3.the1s.de
-      - SERVERPORT=51830
-      - PEERS=2
-      - PEERDNS=172.25.0.5
-      - INTERNAL_SUBNET=10.13.13.0
-      - ALLOWEDIPS=172.25.0.0/24
-      - PERSISTENTKEEPALIVE_PEERS=25
-      - LOG_CONFS=true
-      - POST_UP=iptables -t nat -A POSTROUTING -s 10.13.13.0/24 -o eth0 -j MASQUERADE
-      - POST_DOWN=iptables -t nat -D POSTROUTING -s 10.13.13.0/24 -o eth0 -j MASQUERADE
+      - TZ=Etc/UTC
+      - SERVERURL=dus3.the1s.de #optional
+      - SERVERPORT=51830 #optional
+      - PEERS=2 #optional
+      - PEERDNS=auto #optional
+      - INTERNAL_SUBNET=10.13.13.0 #optional
+      - ALLOWEDIPS=0.0.0.0/0 #optional
+      - PERSISTENTKEEPALIVE_PEERS= #optional
+      - LOG_CONFS=true #optional
     volumes:
-      - ./wireguard-config:/config
-      - /lib/modules:/lib/modules
+      - ./config:/config
+      - /lib/modules:/lib/modules #optional
     ports:
       - 51830:51830/udp
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
     restart: unless-stopped
     networks:
-      - ca-lose-internal
-      - proxynet
+      ca-lose-internal:
+        ipv4_address: 172.25.0.10
 
 volumes:
   ca-lose_mysql:
@@ -90,5 +88,3 @@ networks:
     ipam:
       config:
         - subnet: 172.25.0.0/24
-  proxynet:
-    external: true