From 94013adb1d25d002e455555083ec986f8e5a126f Mon Sep 17 00:00:00 2001
From: phil535 <7596830+phil535@users.noreply.github.com>
Date: Mon, 11 Oct 2021 16:26:57 +0200
Subject: [PATCH] Support for wireguard device name configuration in wg-ui
 userspace (#146)

* added wireguard device name configuration for both wireguard and wireguard-go

* fixed entrypoint to be /wg-go-ui.sh, fixed client ip range for ipaddr parsing

Co-authored-by: phil535 <loibl2@hotmail.com>
---
 docker-compose.userspace.yml | 21 +++++++++++++++++++++
 docker-compose.yml           |  1 +
 wg-go-ui.sh                  |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose.userspace.yml

diff --git a/docker-compose.userspace.yml b/docker-compose.userspace.yml
new file mode 100644
index 0000000..98c1546
--- /dev/null
+++ b/docker-compose.userspace.yml
@@ -0,0 +1,21 @@
+version: "3.7"
+
+services:
+  app:
+    image: embarkstudios/wireguard-ui:userspace
+    privileged: true
+    network_mode: "host"
+    volumes:
+      - /opt/wireguard-ui:/data
+    environment:
+      - WIREGUARD_UI_LISTEN_ADDRESS=:8080
+      - WIREGUARD_UI_LOG_LEVEL=debug
+      - WIREGUARD_UI_DATA_DIR=/data
+      - WIREGUARD_UI_WG_ENDPOINT=your-andpoint-address:51820
+      - WIREGUARD_UI_CLIENT_IP_RANGE=192.168.10.1/24
+     # - WIREGUARD_UI_WG_DNS=192.168.10.1
+      - WIREGUARD_UI_NAT=true
+      - WIREGUARD_UI_NAT_DEVICE=eth0
+     # - WIREGUARD_UI_WG_DEVICE_NAME=wg1
+
+    restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index 0971984..d80eaf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,5 +17,6 @@ services:
      # - WIREGUARD_UI_WG_DNS=192.168.10.0
       - WIREGUARD_UI_NAT=true
       - WIREGUARD_UI_NAT_DEVICE=eth0
+     # - WIREGUARD_UI_WG_DEVICE_NAME=wg0
 
     restart: always
diff --git a/wg-go-ui.sh b/wg-go-ui.sh
index 76a24fa..d6807f5 100755
--- a/wg-go-ui.sh
+++ b/wg-go-ui.sh
@@ -8,7 +8,7 @@ TUNFILE=/dev/net/tun
 [ ! -c $TUNFILE ] && mknod $TUNFILE c 10 200
 
 # Start the first process
-./wireguard-go wg0
+./wireguard-go ${WIREGUARD_UI_WG_DEVICE_NAME:-wg0}
 status=$?
 if [ $status -ne 0 ]; then
   echo "Failed to start wireguard-go: $status"