From patchwork Mon Aug 19 20:02:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: rename public_key to remote_public_key and privat_key to local_privat_key From: Alexander Gutzeit X-Patchwork-Id: 1174 Message-Id: <20190819200255.14632-1-alexander.gutzeit@web.de> To: franken-dev@freifunk.net Date: Mon, 19 Aug 2019 22:02:55 +0200 Signed-off-by: Alexander Gutzeit Reviewed-by: Robert Langhammer --- .../fff-wireguard/files/etc/gateway.d/50-wireguard | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.17.1 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 b2e876d..642cd02 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 @@ -90,8 +90,8 @@ configure() { uci set network.$prefixname.fwmark='0xc8' 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)" + uci set network.$prefixname.local_private_key="$privkey" + echo "INFO: publickey for wireguardpeer ${name}: $(uci get gateway.$name.local_private_key | wg pubkey)" # add wireguard properties @@ -103,7 +103,7 @@ configure() { cfg=$(uci add network wireguard_$prefixname) fi - uci set network.$cfg.public_key="$pubkey" + uci set network.$cfg.remote_public_key="$pubkey" uci set network.$cfg.endpoint_host="$endpoint_host" uci set network.$cfg.endpoint_port="$endpoint_port" uci set network.$cfg.persistent_keepalive="$persistent_keepalive"