Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wireguard: preshared-key is now an attribute of the peer

Browse source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2017-05-09 16:35:41 +02:00
parent c29c5d498e
commit 658ffbb3fd
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/wireguard/files/wireguard.sh
View file

@ -21,7 +21,6 @@ proto_wireguard_init_config() {
proto_config_add_string "private_key" proto_config_add_string "private_key"
proto_config_add_int "listen_port" proto_config_add_int "listen_port"
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_string "preshared_key"
proto_config_add_string "fwmark" proto_config_add_string "fwmark"
available=1 available=1
no_proto_task=1 no_proto_task=1
@ -32,6 +31,7 @@ proto_wireguard_setup_peer() {
local peer_config="$1" local peer_config="$1"
local public_key local public_key
local preshared_key
local allowed_ips local allowed_ips
local route_allowed_ips local route_allowed_ips
local endpoint_host local endpoint_host
@ -39,6 +39,7 @@ proto_wireguard_setup_peer() {
local persistent_keepalive local persistent_keepalive
config_get public_key "${peer_config}" "public_key" config_get public_key "${peer_config}" "public_key"
config_get preshared_key "${peer_config}" "preshared_key"
config_get allowed_ips "${peer_config}" "allowed_ips" config_get allowed_ips "${peer_config}" "allowed_ips"
config_get_bool route_allowed_ips "${peer_config}" "route_allowed_ips" 0 config_get_bool route_allowed_ips "${peer_config}" "route_allowed_ips" 0
config_get endpoint_host "${peer_config}" "endpoint_host" config_get endpoint_host "${peer_config}" "endpoint_host"
@ -48,6 +49,9 @@ proto_wireguard_setup_peer() {
# peer configuration # peer configuration
echo "[Peer]" >> "${wg_cfg}" echo "[Peer]" >> "${wg_cfg}"
echo "PublicKey=${public_key}" >> "${wg_cfg}" echo "PublicKey=${public_key}" >> "${wg_cfg}"
if [ "${preshared_key}" ]; then
echo "PresharedKey=${preshared_key}" >> "${wg_cfg}"
fi
for allowed_ip in $allowed_ips; do for allowed_ip in $allowed_ips; do
echo "AllowedIPs=${allowed_ip}" >> "${wg_cfg}" echo "AllowedIPs=${allowed_ip}" >> "${wg_cfg}"
done done
@ -95,7 +99,6 @@ proto_wireguard_setup() {
local private_key local private_key
local listen_port local listen_port
local mtu local mtu
local preshared_key
# load configuration # load configuration
config_load network config_load network
@ -103,7 +106,6 @@ proto_wireguard_setup() {
config_get listen_port "${config}" "listen_port" config_get listen_port "${config}" "listen_port"
config_get addresses "${config}" "addresses" config_get addresses "${config}" "addresses"
config_get mtu "${config}" "mtu" config_get mtu "${config}" "mtu"
config_get preshared_key "${config}" "preshared_key"
config_get fwmark "${config}" "fwmark" config_get fwmark "${config}" "fwmark"
# create interface # create interface
@ -124,9 +126,6 @@ proto_wireguard_setup() {
if [ "${listen_port}" ]; then if [ "${listen_port}" ]; then
echo "ListenPort=${listen_port}" >> "${wg_cfg}" echo "ListenPort=${listen_port}" >> "${wg_cfg}"
fi fi
if [ "${preshared_key}" ]; then
echo "PresharedKey=${preshared_key}" >> "${wg_cfg}"
fi
if [ "${fwmark}" ]; then if [ "${fwmark}" ]; then
echo "FwMark=${fwmark}" >> "${wg_cfg}" echo "FwMark=${fwmark}" >> "${wg_cfg}"
fi fi