diff --git a/README.md b/README.md index 6ae66b35..de4d9b7a 100644 --- a/README.md +++ b/README.md @@ -84,16 +84,18 @@ These options can be configured by setting environment variables using `-e KEY=" | `WG_HOST` | - | `vpn.myserver.com` | The public hostname of your VPN server. | | `WG_PORT` | `51820` | `12345` | The public UDP port of your VPN server. WireGuard will always listen on `51820` inside the Docker container. | | `WG_MTU` | `null` | `1420` | The MTU the clients will use. Server uses default WG MTU. | -| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. | +| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. If this value is 0, then connections won't be kept alive. | | `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. | -| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L19) for the default value. | -| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L26) for the default value. | +| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L19) for the default value. | +| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L20) for the default value. | +| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L27) for the default value. | +| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L28) for the default value. | > If you change `WG_PORT`, make sure to also change the exposed port. -# Updating +## Updating To update to the latest version, simply run: @@ -103,4 +105,8 @@ docker rm wg-easy docker pull weejewel/wg-easy ``` -And then run the `docker run -d \ ...` command above again. \ No newline at end of file +And then run the `docker run -d \ ...` command above again. + +## Common Use Cases + +* [Using WireGuard-Easy with Pi-Hole](https://github.com/WeeJeWel/wg-easy/wiki/Using-WireGuard-Easy-with-Pi-Hole) diff --git a/docker-compose.yml b/docker-compose.yml index 0a13accc..9842b26f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,10 @@ services: # - WG_DEFAULT_DNS=1.1.1.1 # - WG_MTU=1420 # - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24 + # - WG_PRE_UP=echo "Pre Up" > /etc/wireguard/pre-up.txt + # - WG_POST_UP=echo "Post Up" > /etc/wireguard/post-up.txt + # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt + # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt image: weejewel/wg-easy container_name: wg-easy diff --git a/docs/changelog.json b/docs/changelog.json index 1831e989..ebccbb37 100644 --- a/docs/changelog.json +++ b/docs/changelog.json @@ -3,5 +3,6 @@ "2": "You can now rename a client, and update the address. Enjoy!", "3": "Many improvements and small changes. Enjoy!", "4": "Now with pretty charts for client's network speed. Enjoy!", - "5": "Many small improvements & feature requests. Enjoy!" + "5": "Many small improvements & feature requests. Enjoy!", + "6": "Many small performance improvements & bug fixes. Enjoy!" } \ No newline at end of file diff --git a/src/config.js b/src/config.js index a08aab3b..28c9fc5a 100644 --- a/src/config.js +++ b/src/config.js @@ -16,6 +16,7 @@ module.exports.WG_DEFAULT_DNS = typeof process.env.WG_DEFAULT_DNS === 'string' : '1.1.1.1'; module.exports.WG_ALLOWED_IPS = process.env.WG_ALLOWED_IPS || '0.0.0.0/0, ::/0'; +module.exports.WG_PRE_UP = process.env.WG_PRE_UP || ''; module.exports.WG_POST_UP = process.env.WG_POST_UP || ` iptables -t nat -A POSTROUTING -s ${module.exports.WG_DEFAULT_ADDRESS.replace('x', '0')}/24 -o eth0 -j MASQUERADE; iptables -A INPUT -p udp -m udp --dport 51820 -j ACCEPT; @@ -23,4 +24,5 @@ iptables -A FORWARD -i wg0 -j ACCEPT; iptables -A FORWARD -o wg0 -j ACCEPT; `.split('\n').join(' '); +module.exports.WG_PRE_DOWN = process.env.WG_PRE_DOWN || ''; module.exports.WG_POST_DOWN = process.env.WG_POST_DOWN || ''; diff --git a/src/lib/Server.js b/src/lib/Server.js index e204fa5f..c893d7d5 100644 --- a/src/lib/Server.js +++ b/src/lib/Server.js @@ -62,7 +62,7 @@ module.exports = class Server { req.session.authenticated = true; req.session.save(); - debug(`New Session: ${req.session.id})`); + debug(`New Session: ${req.session.id}`); })) // WireGuard @@ -99,7 +99,11 @@ module.exports = class Server { const { clientId } = req.params; const client = await WireGuard.getClient({ clientId }); const config = await WireGuard.getClientConfiguration({ clientId }); - const configName = client.name.replace(/[^a-zA-Z0-9_=+.-]/g, '-').replace(/(-{2,}|-$)/g, '-').replace(/-$/, '').substring(0, 32); + const configName = client.name + .replace(/[^a-zA-Z0-9_=+.-]/g, '-') + .replace(/(-{2,}|-$)/g, '-') + .replace(/-$/, '') + .substring(0, 32); res.header('Content-Disposition', `attachment; filename="${configName}.conf"`); res.header('Content-Type', 'text/plain'); res.send(config); diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js index 032854f1..7886ac91 100644 --- a/src/lib/WireGuard.js +++ b/src/lib/WireGuard.js @@ -19,7 +19,9 @@ const { WG_DEFAULT_ADDRESS, WG_PERSISTENT_KEEPALIVE, WG_ALLOWED_IPS, + WG_PRE_UP, WG_POST_UP, + WG_PRE_DOWN, WG_POST_DOWN, } = require('../config'); @@ -94,7 +96,9 @@ module.exports = class WireGuard { PrivateKey = ${config.server.privateKey} Address = ${config.server.address}/24 ListenPort = 51820 +PreUp = ${WG_PRE_UP} PostUp = ${WG_POST_UP} +PreDown = ${WG_PRE_DOWN} PostDown = ${WG_POST_DOWN} `; @@ -261,6 +265,8 @@ Endpoint = ${WG_HOST}:${WG_PORT}`; config.clients[clientId] = client; await this.saveConfig(); + + return client; } async deleteClient({ clientId }) { diff --git a/src/package.json b/src/package.json index b65bc224..ef48ef22 100644 --- a/src/package.json +++ b/src/package.json @@ -1,5 +1,5 @@ { - "release": 5, + "release": 6, "name": "wg-easy", "version": "1.0.0", "description": "", diff --git a/src/www/index.html b/src/www/index.html index 3d2c1590..14259b9e 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -11,11 +11,17 @@ + +
-
+
-
- - -
-
- +
+
@@ -117,7 +118,7 @@
-
+
- + · @@ -480,7 +481,7 @@
-

{{$t("madeBy")}} {{$t("madeBy")}} Emile Nijssen · {{$t("donate")}} · GitHub

diff --git a/src/www/js/api.js b/src/www/js/api.js index accbb579..84885f17 100644 --- a/src/www/js/api.js +++ b/src/www/js/api.js @@ -6,7 +6,7 @@ class API { async call({ method, path, body }) { - const res = await fetch(`/api${path}`, { + const res = await fetch(`./api${path}`, { method, headers: { 'Content-Type': 'application/json', diff --git a/src/www/js/app.js b/src/www/js/app.js index cbccefb9..2ffea223 100644 --- a/src/www/js/app.js +++ b/src/www/js/app.js @@ -60,31 +60,36 @@ new Vue({ chartOptions: { chart: { background: 'transparent', - type: 'area', + type: 'bar', + stacked: false, toolbar: { show: false, }, + animations: { + enabled: false, + }, }, - fill: { - type: 'gradient', - }, - colors: ['#CCCCCC'], + colors: [ + '#DDDDDD', // rx + '#EEEEEE', // tx + ], dataLabels: { enabled: false, }, - stroke: { - curve: 'smooth', - width: 0, + plotOptions: { + bar: { + horizontal: false, + }, }, xaxis: { labels: { show: false, }, axisTicks: { - show: false, + show: true, }, axisBorder: { - show: false, + show: true, }, }, yaxis: { @@ -139,9 +144,9 @@ new Vue({ if (!this.clientsPersist[client.id]) { this.clientsPersist[client.id] = {}; - this.clientsPersist[client.id].transferRxHistory = Array(20).fill(0); + this.clientsPersist[client.id].transferRxHistory = Array(100).fill(0); this.clientsPersist[client.id].transferRxPrevious = client.transferRx; - this.clientsPersist[client.id].transferTxHistory = Array(20).fill(0); + this.clientsPersist[client.id].transferTxHistory = Array(100).fill(0); this.clientsPersist[client.id].transferTxPrevious = client.transferTx; this.clientsPersist[client.id].chartOptions = { @@ -164,22 +169,20 @@ new Vue({ this.clientsPersist[client.id].transferTxHistory.push(this.clientsPersist[client.id].transferTxCurrent); this.clientsPersist[client.id].transferTxHistory.shift(); + this.clientsPersist[client.id].chartMax = Math.max(...this.clientsPersist[client.id].transferTxHistory, ...this.clientsPersist[client.id].transferRxHistory); + client.transferTxCurrent = this.clientsPersist[client.id].transferTxCurrent; - client.transferTxSeries = [{ + client.transferRxCurrent = this.clientsPersist[client.id].transferRxCurrent; + + client.chartOptions = this.clientsPersist[client.id].chartOptions; + client.chartSeries = [{ name: 'tx', data: this.clientsPersist[client.id].transferTxHistory, - }]; - - client.transferRxCurrent = this.clientsPersist[client.id].transferRxCurrent; - client.transferRxSeries = [{ + }, { name: 'rx', data: this.clientsPersist[client.id].transferRxHistory, }]; - this.clientsPersist[client.id].chartMax = Math.max(...this.clientsPersist[client.id].transferTxHistory, ...this.clientsPersist[client.id].transferRxHistory); - - client.chartOptions = this.clientsPersist[client.id].chartOptions; - return client; }); },