From 65f5683217410591644d640d8405746b3b8d5575 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Mon, 22 Aug 2022 07:51:40 +0200 Subject: [PATCH 1/4] test: change wireguard ports --- apps/wg-easy/docker-compose.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/wg-easy/docker-compose.yml b/apps/wg-easy/docker-compose.yml index 907cb315..78b967ae 100644 --- a/apps/wg-easy/docker-compose.yml +++ b/apps/wg-easy/docker-compose.yml @@ -6,16 +6,14 @@ services: restart: unless-stopped volumes: - ${APP_DATA_DIR}/data:/etc/wireguard - - /lib/modules:/lib/modules ports: - - 51822:51820/udp + - 51820:51820/udp - ${APP_PORT}:51821/tcp environment: WG_HOST: "${WIREGUARD_HOST}" PASSWORD: "${WIREGUARD_PASSWORD}" - WG_ALLOWED_IPS: 0.0.0.0/0,::/0 - WG_PORT: 51822 WG_DEFAULT_DNS: "${WIREGUARD_DNS:-8.8.8.8}" + WG_PERSISTENT_KEEPALIVE: 15 cap_add: - NET_ADMIN - SYS_MODULE From 068c81af31de023b26a5052fde7b1d7c04dadab4 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Mon, 22 Aug 2022 08:01:58 +0200 Subject: [PATCH 2/4] fix: remove dns setting from docker-compose.yml --- apps/wg-easy/docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/wg-easy/docker-compose.yml b/apps/wg-easy/docker-compose.yml index 78b967ae..086ebdb0 100644 --- a/apps/wg-easy/docker-compose.yml +++ b/apps/wg-easy/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" services: wg-easy: container_name: wg-easy @@ -17,8 +17,6 @@ services: cap_add: - NET_ADMIN - SYS_MODULE - dns: - - "${WIREGUARD_DNS:-8.8.8.8}" sysctls: - net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.ip_forward=1 From 31100b06023efcba19abe363534135dfb47bcda3 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Mon, 22 Aug 2022 08:02:51 +0200 Subject: [PATCH 3/4] chore: bump version --- apps/wg-easy/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wg-easy/config.json b/apps/wg-easy/config.json index 1048fe24..53373f21 100644 --- a/apps/wg-easy/config.json +++ b/apps/wg-easy/config.json @@ -6,7 +6,7 @@ "ports": [51820] }, "id": "wg-easy", - "tipi_version": 1, + "tipi_version": 2, "version": "7", "categories": ["network"], "description": "Access your homeserver from anywhere even on your mobile device. Wireguard-easy is a simple tool to configure and manage Wireguard VPN servers. It is written in Go and uses the official Wireguard client. You have to open and redirect port 51820 to your homeserver in order to connect.", From eb7425681b3b2ccbe6bb4e32110f6fa04cd1d6e2 Mon Sep 17 00:00:00 2001 From: Nicolas Meienberger Date: Mon, 22 Aug 2022 08:19:30 +0200 Subject: [PATCH 4/4] chore: remove traefik labels --- apps/wg-easy/docker-compose.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/wg-easy/docker-compose.yml b/apps/wg-easy/docker-compose.yml index 086ebdb0..e81afd95 100644 --- a/apps/wg-easy/docker-compose.yml +++ b/apps/wg-easy/docker-compose.yml @@ -13,7 +13,7 @@ services: WG_HOST: "${WIREGUARD_HOST}" PASSWORD: "${WIREGUARD_PASSWORD}" WG_DEFAULT_DNS: "${WIREGUARD_DNS:-8.8.8.8}" - WG_PERSISTENT_KEEPALIVE: 15 + WG_ALLOWED_IPS: 0.0.0.0/0, ::/0 cap_add: - NET_ADMIN - SYS_MODULE @@ -21,11 +21,4 @@ services: - net.ipv4.conf.all.src_valid_mark=1 - net.ipv4.ip_forward=1 networks: - - tipi_main_network - # labels: - # traefik.enable: true - # traefik.http.routers.wireguard.rule: Host(`wireguard.tipi.home`) - # traefik.http.routers.wireguard.service: wireguard - # traefik.http.routers.wireguard.tls: true - # traefik.http.routers.wireguard.entrypoints: websecure - # traefik.http.services.wireguard.loadbalancer.server.port: 51821 + - tipi_main_network \ No newline at end of file