Merge pull request #37 from WeeJeWel/master

mmip

Dockerfile

@@ -10,10 +10,10 @@ RUN npm ci --production
 
 # Expose Ports
 EXPOSE 51820/udp
-EXPOSE 80/tcp
+EXPOSE 51821/tcp
 
 # Set Environment
 ENV DEBUG=Server,WireGuard
 
 # Run Web UI
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]

README.md

@@ -73,5 +73,6 @@ These options can be configured in `docker-compose.yml` under `environment`.
 | `WG_PORT` | `51820` | `51820` | The public UDP port of your VPN server |
 | `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range |
 | `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use |
+| `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use |
 
 > If you change `WG_PORT`, make sure to also change the exposed port.

docker-compose.yml

@@ -11,6 +11,7 @@ services:
       # - WG_PORT=51820
       # - WG_DEFAULT_ADDRESS=10.8.0.x
       # - WG_DEFAULT_DNS=1.1.1.1
+      # - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24
       
     image: weejewel/wg-easy
     container_name: wg-easy

src/config.js

@@ -7,3 +7,4 @@ module.exports.WG_HOST = process.env.WG_HOST;
 module.exports.WG_PORT = process.env.WG_PORT || 51820;
 module.exports.WG_DEFAULT_ADDRESS = process.env.WG_DEFAULT_ADDRESS || '10.8.0.x';
 module.exports.WG_DEFAULT_DNS = process.env.WG_DEFAULT_DNS || '1.1.1.1';
+module.exports.WG_ALLOWED_IPS = process.env.WG_ALLOWED_IPS || '0.0.0.0/0, ::/0';

src/lib/WireGuard.js

@@ -16,6 +16,7 @@ const {
   WG_PORT,
   WG_DEFAULT_DNS,
   WG_DEFAULT_ADDRESS,
+  WG_ALLOWED_IPS,
 } = require('../config');
 
 module.exports = class WireGuard {
@@ -178,7 +179,7 @@ DNS = ${WG_DEFAULT_DNS}
 [Peer]
 PublicKey = ${config.server.publicKey}
 PresharedKey = ${client.preSharedKey}
-AllowedIPs = 0.0.0.0/0, ::/0
+AllowedIPs = ${WG_ALLOWED_IPS}
 Endpoint = ${WG_HOST}:${WG_PORT}`;
   }