-
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #397 from grische/feature/update-wireguard-modules
[Backport legacy] modules: use latest packages for ffmuc-mesh-vpn-wireguard and ffmuc-ipv6-ra-filter
- Loading branch information
Showing
24 changed files
with
316 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| From 42811401a12568bab07be160c674a229e0572367 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <[email protected]> | ||
| Date: Wed, 12 Jan 2022 01:31:58 +0100 | ||
| Subject: [PATCH 1/4] gluon-core: add gluon info binary | ||
|
|
||
| This copies the code from web-admin and uses it to create a neat | ||
| cli-accessible summary about a node | ||
|
|
||
| This could also be extended or possibly have all the data the status | ||
| page has | ||
|
|
||
| Co-Authored-By: Matthias Schiffer <[email protected]> | ||
| --- | ||
| package/gluon-core/luasrc/usr/bin/gluon-info | 38 ++++++++++++++++++++ | ||
| 1 file changed, 38 insertions(+) | ||
| create mode 100755 package/gluon-core/luasrc/usr/bin/gluon-info | ||
|
|
||
| diff --git a/package/gluon-core/luasrc/usr/bin/gluon-info b/package/gluon-core/luasrc/usr/bin/gluon-info | ||
| new file mode 100755 | ||
| index 00000000..8cee2895 | ||
| --- /dev/null | ||
| +++ b/package/gluon-core/luasrc/usr/bin/gluon-info | ||
| @@ -0,0 +1,38 @@ | ||
| +#!/usr/bin/lua | ||
| + | ||
| +local uci = require('simple-uci').cursor() | ||
| +local pretty_hostname = require 'pretty_hostname' | ||
| + | ||
| +local site = require 'gluon.site' | ||
| +local sysconfig = require 'gluon.sysconfig' | ||
| +local platform = require 'gluon.platform' | ||
| +local util = require 'gluon.util' | ||
| +local has_vpn, vpn = pcall(require, 'gluon.mesh-vpn') | ||
| + | ||
| +local pubkey | ||
| +if has_vpn and vpn.enabled() then | ||
| + local _, active_vpn = vpn.get_active_provider() | ||
| + | ||
| + if active_vpn ~= nil then | ||
| + pubkey = active_vpn.public_key() | ||
| + end | ||
| +end | ||
| + | ||
| +local values = { | ||
| + { 'Hostname', pretty_hostname.get(uci) }, | ||
| + { 'MAC address', sysconfig.primary_mac }, | ||
| + { 'Hardware model', platform.get_model() }, | ||
| + { 'Gluon version' .. " / " .. 'Site version', util.trim(util.readfile('/lib/gluon/gluon-version')) | ||
| + .. " / " .. util.trim(util.readfile('/lib/gluon/site-version')) }, | ||
| + { 'Firmware release', util.trim(util.readfile('/lib/gluon/release')) }, | ||
| + { 'Site', site.site_name() }, | ||
| + { 'Public VPN key', pubkey or 'n/a' }, | ||
| +} | ||
| + | ||
| +local padTo = 24 | ||
| + | ||
| +for _, info in ipairs(values) do | ||
| + local labelLen = string.len(info[1]) + 1 | ||
| + | ||
| + print(info[1] .. ':' .. string.rep(' ', padTo - labelLen), info[2]) | ||
| +end | ||
| -- | ||
| 2.34.1 | ||
|
|
28 changes: 28 additions & 0 deletions
28
patches/0002-gluon-mesh-vpn-wireguard-fix-empty-string-key.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From 95e711a4a8bba9ef5b9103f8eefda18329fa97a9 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <[email protected]> | ||
| Date: Wed, 12 Jan 2022 01:36:03 +0100 | ||
| Subject: [PATCH 2/4] gluon-mesh-vpn-wireguard: fix empty string key | ||
|
|
||
| Co-Authored-By: Matthias Schiffer <[email protected]> | ||
| --- | ||
| package/gluon-core/luasrc/usr/bin/gluon-info | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/package/gluon-core/luasrc/usr/bin/gluon-info b/package/gluon-core/luasrc/usr/bin/gluon-info | ||
| index 8cee2895..c25018d1 100755 | ||
| --- a/package/gluon-core/luasrc/usr/bin/gluon-info | ||
| +++ b/package/gluon-core/luasrc/usr/bin/gluon-info | ||
| @@ -22,8 +22,8 @@ local values = { | ||
| { 'Hostname', pretty_hostname.get(uci) }, | ||
| { 'MAC address', sysconfig.primary_mac }, | ||
| { 'Hardware model', platform.get_model() }, | ||
| - { 'Gluon version' .. " / " .. 'Site version', util.trim(util.readfile('/lib/gluon/gluon-version')) | ||
| - .. " / " .. util.trim(util.readfile('/lib/gluon/site-version')) }, | ||
| + { 'Gluon version / Site version', util.trim(util.readfile('/lib/gluon/gluon-version')) | ||
| + .. ' / ' .. util.trim(util.readfile('/lib/gluon/site-version')) }, | ||
| { 'Firmware release', util.trim(util.readfile('/lib/gluon/release')) }, | ||
| { 'Site', site.site_name() }, | ||
| { 'Public VPN key', pubkey or 'n/a' }, | ||
| -- | ||
| 2.34.1 | ||
|
|
Oops, something went wrong.