Merge branch 'dev' into prod

This commit is contained in:
2026-01-20 20:33:31 +01:00

View File

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