Merge remote-tracking branch 'wg-easy/master'

Dockerfile

@@ -40,9 +40,9 @@ RUN apk add --no-cache \
 # Use iptables-legacy
 RUN update-alternatives --install /sbin/iptables iptables /sbin/iptables-legacy 10 --slave /sbin/iptables-restore iptables-restore /sbin/iptables-legacy-restore --slave /sbin/iptables-save iptables-save /sbin/iptables-legacy-save
 
-# Expose Ports
-EXPOSE 51820/udp
-EXPOSE 51821/tcp
+# Expose Ports (If needed on buildtime)
+#EXPOSE 51820/udp
+#EXPOSE 51821/tcp
 
 # Set Environment
 ENV DEBUG=Server,WireGuard

README.md

@@ -53,10 +53,13 @@ And log in again.
 To automatically install & run wg-easy, simply run:
 
 ```
-  docker run -d \  --name=wg-easy-m3 \
-  -e LANG=en \
-  -e WG_HOST=<b>🚨YOUR_SERVER_IP</b> \
-  -e PASSWORD=<b>🚨YOUR_ADMIN_PASSWORD</b> \
+  docker run -d \
+  --name=wg-easy-m3 \
+  -e LANG=de \
+  -e WG_HOST=<🚨YOUR_SERVER_IP> \
+  -e PASSWORD=<🚨YOUR_ADMIN_PASSWORD> \
+  -e PORT=51821 \
+  -e WG_PORT=51820 \
   -v ~/.wg-easy:/etc/wireguard \
   -p 51820:51820/udp \
   -p 51821:51821/tcp \

docker-compose.yml

@@ -14,6 +14,7 @@ services:
 
       # Optional:
       # - PASSWORD=foobar123
+      # - PORT=51821
       # - WG_PORT=51820
       # - WG_DEFAULT_ADDRESS=10.8.0.x
       # - WG_DEFAULT_DNS=1.1.1.1

src/lib/WireGuard.js

@@ -95,7 +95,7 @@ module.exports = class WireGuard {
 [Interface]
 PrivateKey = ${config.server.privateKey}
 Address = ${config.server.address}/24
-ListenPort = 51820
+ListenPort = ${WG_PORT}
 PreUp = ${WG_PRE_UP}
 PostUp = ${WG_POST_UP}
 PreDown = ${WG_PRE_DOWN}