From ca40d2d76697d67ee6dfc40bdf8b1b1e90165bfa Mon Sep 17 00:00:00 2001
From: Alexander Gutzeit <alexander.gutzeit@web.de>
Date: Mon, 19 Aug 2019 22:02:55 +0200
Subject: [PATCH] fff-wireguard: rename keys to
remote_public_key/local_private_key
This renames two options for wireguard interfaces in
/etc/config/gateway:
public_key -> remote_public_key
private_key -> local_private_key
Signed-off-by: Alexander Gutzeit <alexander.gutzeit@web.de>
Reviewed-by: Robert Langhammer <rlanghammer@web.de>
[adjusted commit message/title, added version bump, remove
rename for network config]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
.../fff/fff-wireguard/files/etc/gateway.d/50-wireguard | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
index b2e876de..3013e3f5 100644
--- a/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
+++ b/src/packages/fff/fff-wireguard/files/etc/gateway.d/50-wireguard
@@ -59,12 +59,12 @@ configure() {
local persistent_keepalive
local mtu
- if ! privkey=$(uci -q get gateway.$name.private_key); then
+ if ! privkey=$(uci -q get gateway.$name.local_private_key); then
privkey=$(wg genkey)
- uci set gateway.$name.private_key="$privkey"
+ uci set gateway.$name.local_private_key="$privkey"
fi
- if ! pubkey=$(uci get gateway.$name.public_key); then
+ if ! pubkey=$(uci get gateway.$name.remote_public_key); then
echo "ERROR: publickey for ${name} missing!"
exit 1
fi
@@ -91,7 +91,7 @@ configure() {
uci set network.$prefixname.mtu="${mtu:-1420}"
uci set network.$prefixname.private_key="$privkey"
- echo "INFO: publickey for wireguardpeer ${name}: $(uci get gateway.$name.private_key | wg pubkey)"
+ echo "INFO: publickey for wireguardpeer ${name}: $(uci get gateway.$name.local_private_key | wg pubkey)"
# add wireguard properties
--
GitLab