Skip to content

luci-app-wireguard: convert to JavaScript #5323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 22, 2021
Merged

luci-app-wireguard: convert to JavaScript #5323

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8950c9f
luci-app-wireguard: replace luci-app-wireguard
lvoegl Aug 31, 2021
d98935c
luci-app-wireguard: merge app and proto rpcd
lvoegl Aug 31, 2021
8530232
luci-proto-wireguard: client qr code generation
lvoegl Sep 8, 2021
03d615f
luci-proto-wireguard: add more options to qr code
lvoegl Sep 10, 2021
f062ce7
luci-proto-wireguard: update i18n
lvoegl Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
luci-app-wireguard: merge app and proto rpcd 
Signed-off-by: lvoegl <lvoegl@tdt.de>
  • Loading branch information
@lvoegl
lvoegl committed Sep 17, 2021
commit d98935c45b7affde6b5323d87473ea82736a1335
2 changes: 1 addition & 1 deletion applications/luci-app-wireguard/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk

LUCI_TITLE:=WireGuard Status
LUCI_DEPENDS:=+wireguard-tools +luci-proto-wireguard
LUCI_DEPENDS:=+wireguard-tools
LUCI_PKGARCH:=all

include ../../luci.mk
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-wireguard/htdocs/luci-static/resources/view/wireguard/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@


var callGetWgInstances = rpc.declare({
object: 'luci.wireguard_status',
object: 'luci.wireguard',
method: 'getWgInstances'
});

Expand Down
8 changes: 8 additions & 0 deletions ...ot/usr/libexec/rpcd/luci.wireguard_status → ...uard/root/usr/libexec/rpcd/luci.wireguard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ local io = require "io"
local uci = require "uci"

local methods = {
generateKeyPair = {
call = function()
local prv = sys.exec("wg genkey 2>/dev/null"):sub(1, -2)
local pub = sys.exec("echo '" .. prv .. "' | wg pubkey 2>/dev/null"):sub(1, -2)

return {keys = {priv = prv, pub = pub}}
end
},
getWgInstances = {
call = function()
local data = {}
Expand Down
2 changes: 1 addition & 1 deletion applications/luci-app-wireguard/root/usr/share/rpcd/acl.d/luci-app-wireguard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Grant access to LuCI app wireguard",
"read": {
"ubus": {
"luci.wireguard_status": [
"luci.wireguard": [
"getWgInstances"
]
}
Expand Down
2 changes: 1 addition & 1 deletion protocols/luci-proto-wireguard/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions protocols/luci-proto-wireguard/root/usr/libexec/rpcd/luci.wireguard
View file
Open in desktop

This file was deleted.