forks
/
amnezia-wg-easy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct CIDR notation

This commit is contained in:
Thomas Willems 2024-02-13 13:55:00 +01:00 committed by pheiduck
parent 89415a2258
commit c4d4da38e7
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -90,7 +90,7 @@ These options can be configured by setting environment variables using `-e KEY="
| `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. If this value is 0, then connections won't be kept alive. |
| `WG_DEFAULT_ADDRESS` | `10.8.0.1/24` | `10.6.0.x` | Clients IP address range. (For Legacy reasons x in last place is supported (e.g. 10.8.0.x)) |
| `WG_DEFAULT_ADDRESS` | `10.8.0.0/24` | `10.6.0.0/24` | Clients IP address range. (For Legacy reasons x in last place is supported and will be replaced with 0/24 (e.g. 10.8.0.x)) |
| `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. If set to blank value, clients will not use any DNS. |
| `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_PRE_UP` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L19) for the default value. |

2
docker-compose.yml
View File

@ -15,7 +15,7 @@ services:
# Optional:
# - PASSWORD=foobar123
# - WG_PORT=51820
# - WG_DEFAULT_ADDRESS=10.8.0.1/24
# - WG_DEFAULT_ADDRESS=10.8.0.0/24
# - WG_DEFAULT_DNS=1.1.1.1
# - WG_MTU=1420
# - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24

8
src/config.js
View File

@ -6,11 +6,11 @@ const { release } = require('./package.json');
function parseDefaultAddress(defaultAddress) {
// Set the default full address with subnet if it's not provided
const defaultFullAddress = defaultAddress || '10.8.0.1/24';
const defaultFullAddress = defaultAddress || '10.8.0.0/24';
// Check if the address ends with '.x', if so, replace with '.1/24'
// Check if the address ends with '.x', if so, replace with '.0/24'
const addressWithSubnet = defaultFullAddress.endsWith('.x')
? defaultFullAddress.replace('.x', '.1/24')
? defaultFullAddress.replace('.x', '.0/24')
: defaultFullAddress;
const [ipAddress, subnetRange] = addressWithSubnet.split('/');
@ -21,7 +21,7 @@ function parseDefaultAddress(defaultAddress) {
};
}
// Use the function to parse the environment variable or default to '10.8.0.1/24'
// Use the function to parse the environment variable or default to '10.8.0.0/24'
const { ipAddress, subnetRange } = parseDefaultAddress(process.env.WG_DEFAULT_ADDRESS);
module.exports.RELEASE = release;

2
wg-easy.service
View File

@ -5,7 +5,7 @@ After=network-online.target nss-lookup.target
[Service]
Environment="WG_HOST=raspberrypi.local" # Change this to your host's public address or static public ip.
Environment="PASSWORD=REPLACEME" # When set, requires a password when logging in to the Web UI, to disable add a hashtag
#Environment="WG_DEFAULT_ADDRESS=10.0.8.1/24" #Clients IP address range.
#Environment="WG_DEFAULT_ADDRESS=10.0.8.0/24" # Clients IP address range.
#Environment="WG_DEFAULT_DNS=10.0.8.1, 1.1.1.1" #DNS server clients will use. If set to blank value, clients will not use any DNS.
#Environment="WG_ALLOWED_IPS=0.0.0.0/0,::/0" #Allowed IPs clients will use.
#Environment="WG_DEVICE=ens1" #Ethernet device the wireguard traffic should be forwarded through.