summaryrefslogtreecommitdiffhomepage
path: root/protocols
diff options
context:
space:
mode:
authorlvoegl <lvoegl@tdt.de>2021-08-31 13:51:06 +0200
committerLukas Voegl <lvoegl@tdt.de>2021-09-17 14:15:56 +0200
commitd98935c45b7affde6b5323d87473ea82736a1335 (patch)
tree14d39d02a2b499d791d5607bea3267d3945e518a /protocols
parent8950c9f66c5d2e6123aeb5359fc3861d2f09ca72 (diff)
luci-app-wireguard: merge app and proto rpcd
Signed-off-by: lvoegl <lvoegl@tdt.de>
Diffstat (limited to 'protocols')
-rw-r--r--protocols/luci-proto-wireguard/Makefile2
-rwxr-xr-xprotocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard26
2 files changed, 1 insertions, 27 deletions
diff --git a/protocols/luci-proto-wireguard/Makefile b/protocols/luci-proto-wireguard/Makefile
index f88b90bbfa..45ec1921cc 100644
--- a/protocols/luci-proto-wireguard/Makefile
+++ b/protocols/luci-proto-wireguard/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=Support for WireGuard VPN
-LUCI_DEPENDS:=+wireguard-tools
+LUCI_DEPENDS:=+wireguard-tools +luci-app-wireguard
LUCI_PKGARCH:=all
include ../../luci.mk
diff --git a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard b/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
deleted file mode 100755
index a6c951f3de..0000000000
--- a/protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-
-case "$1" in
- list)
- json_init
- json_add_object "generateKeyPair"
- json_close_object
- json_dump
- ;;
- call)
- case "$2" in
- generateKeyPair)
- prv=$(wg genkey)
- pub=$(echo $prv | wg pubkey)
- json_init
- json_add_object "keys"
- json_add_string "priv" "$prv"
- json_add_string "pub" "$pub"
- json_close_object
- json_dump
- ;;
- esac
- ;;
-esac