From 2cd2d11ce4d65c0317b7323fa2c3c83e1c68da2a Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Wed, 21 Aug 2024 10:26:24 +0300 Subject: [PATCH 01/38] fix func amneziawg.sh --- amneziawg-tools/files/amneziawg.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh index 03b981f0..39e2017f 100755 --- a/amneziawg-tools/files/amneziawg.sh +++ b/amneziawg-tools/files/amneziawg.sh @@ -305,7 +305,6 @@ proto_amneziawg_setup() { proto_amneziawg_teardown() { local config="$1" - proto_amneziawg_check_installed if proto_amneziawg_is_kernel_mode; then ip link del dev "${config}" >/dev/null 2>&1 else From de5a452c80bce8cca0f7cc431e9d4b34baee402a Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 10:59:32 +0300 Subject: [PATCH 02/38] Update amneziawg.js --- .../resources/protocol/amneziawg.js | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 04842f85..84d0dff5 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1191,23 +1191,19 @@ return network.registerProtocol("amneziawg", { o.datatype = "range(0,65535)"; o.placeholder = "0"; - o = ss.option( - form.DummyValue, - "_keyops", - _("Configuration Export"), - _("Generates a configuration suitable for import on a AmneziaWG peer") - ); + o = ss.option(form.DummyValue,"_keyops",_("Configuration Export"), + _("Generates a configuration suitable for import on a AmneziaWG peer")); o.modalonly = true; o.createPeerConfig = function (section_id, endpoint, ips) { var pub = s.formvalue(s.section, "public_key"), - port = s.formvalue(s.section, "listen_port") || "51820", - jc = s.formvalue; - (prv = this.section.formvalue(section_id, "private_key")), - (psk = this.section.formvalue(section_id, "preshared_key")), - (eport = this.section.formvalue(section_id, "endpoint_port")), - (keep = this.section.formvalue(section_id, "persistent_keepalive")); + port = s.formvalue(s.section, "listen_port") || "51820", + jc = s.formvalue, + prv = this.section.formvalue(section_id, "private_key"), + psk = this.section.formvalue(section_id, "preshared_key"), + eport = this.section.formvalue(section_id, "endpoint_port"), + keep = this.section.formvalue(section_id, "persistent_keepalive"); // If endpoint is IPv6 we must escape it with [] if (endpoint.indexOf(":") > 0) { From 7d918cbc9b882ce0585a533aeda4c6d8ac26e1c1 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 12:20:47 +0300 Subject: [PATCH 03/38] Update amneziawg.js --- .../resources/protocol/amneziawg.js | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 84d0dff5..3b768274 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1196,10 +1196,18 @@ return network.registerProtocol("amneziawg", { o.modalonly = true; - o.createPeerConfig = function (section_id, endpoint, ips) { + o.createPeerConfig = function (section_id, endpoint, ips, eips, dns) { var pub = s.formvalue(s.section, "public_key"), port = s.formvalue(s.section, "listen_port") || "51820", - jc = s.formvalue, + jc = s.formvalue(s.section, "awg_jc") || "2", + jmin = s.formvalue(s.section, "awg_jmin") || "1", + jmax = s.formvalue(s.section, "awg_jmax") || "1000", + s1 = s.formvalue(s.section, "awg_s1") || "0", + s2 = s.formvalue(s.section, "awg_s2") || "0", + h1 = s.formvalue(s.section, "awg_h1") || "1", + h2 = s.formvalue(s.section, "awg_h2") || "2", + h3 = s.formvalue(s.section, "awg_h3") || "3", + h4 = s.formvalue(s.section, "awg_h4") || "4", prv = this.section.formvalue(section_id, "private_key"), psk = this.section.formvalue(section_id, "preshared_key"), eport = this.section.formvalue(section_id, "endpoint_port"), @@ -1213,7 +1221,18 @@ return network.registerProtocol("amneziawg", { return [ "[Interface]", "PrivateKey = " + prv, + eips && eips.length ? "Address = " + eips.join(", ") : "# Address not defined", eport ? "ListenPort = " + eport : "# ListenPort not defined", + dns && dns.length ? "DNS = " + dns.join(", ") : "# DNS not defined", + "Jc = " + jc, + "Jmin = " + jmin, + "Jmax = " + jmax, + "S1 = " + s1, + "S2 = " + s2, + "H1 = " + h1, + "H2 = " + h2, + "H3 = " + h3, + "H4 = " + h4, "", "[Peer]", "PublicKey = " + pub, From c9e60562043ae8c965888b2d55cc310e9e5cc29d Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 12:31:16 +0300 Subject: [PATCH 04/38] Update amneziawg.js --- .../resources/protocol/amneziawg.js | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 3b768274..9e6daf44 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1254,10 +1254,12 @@ return network.registerProtocol("amneziawg", { headNode = mapNode.parentNode.querySelector("h4"), configGenerator = this.createPeerConfig.bind(this, section_id), parent = this.map; + eips = this.section.formvalue(section_id, 'allowed_ips'); return Promise.all([ network.getWANNetworks(), network.getWAN6Networks(), + network.getNetwork('lan'), L.resolveDefault(uci.load("ddns")), L.resolveDefault(uci.load("system")), parent.save(null, true), @@ -1291,11 +1293,21 @@ return network.registerProtocol("amneziawg", { ); var ips = ["0.0.0.0/0", "::/0"]; + + var dns = []; + + var lan = data[2]; + if (lan) { + var lanIp = lan.getIPAddr(); + if (lanIp) { + dns.unshift(lanIp) + } + } var qrm, qrs, qro; qrm = new form.JSONMap( - { config: { endpoint: hostnames[0], allowed_ips: ips } }, + { config: { endpoint: hostnames[0], allowed_ips: ips, addresses: eips, dns_servers: dns } }, null, _( "The generated configuration can be imported into a AmneziaWG client application to set up a connection towards this device." @@ -1309,7 +1321,9 @@ return network.registerProtocol("amneziawg", { var code = this.map.findElement(".qr-code"), conf = this.map.findElement(".client-config"), endpoint = this.section.getUIElement(section_id, "endpoint"), - ips = this.section.getUIElement(section_id, "allowed_ips"); + ips = this.section.getUIElement(section_id, "allowed_ips"), + eips = this.section.getUIElement(section_id, 'addresses'), + dns = this.section.getUIElement(section_id, 'dns_servers'); if (this.isValid(section_id)) { conf.firstChild.data = configGenerator( @@ -1351,9 +1365,20 @@ return network.registerProtocol("amneziawg", { }); qro.onchange = handleConfigChange; + qro = qrs.option(form.DynamicList, "dns_servers", _("DNS Servers"), _("DNS servers for the remote clients using this tunnel to your openwrt device. Some AmneziaWG clients require this to be set.")); + qro.datatype = "ipaddr"; + qro.default = dns; + qro.onchange = handleConfigChange; + + qro = qrs.option(form.DynamicList, "addresses", _("Addresses"), _("IP addresses for the peer to use inside the tunnel. Some clients require this setting.")); + qro.datatype = 'ipaddr'; + qro.default = eips; + eips.forEach(function(eip) { qro.value(eip) }); + qro.onchange = handleConfigChange; + qro = qrs.option(form.DummyValue, "output"); qro.renderWidget = function () { - var peer_config = configGenerator(hostnames[0], ips); + var peer_config = configGenerator(hostnames[0], ips, eips, dns); var node = E( "div", From 21ef905fa5e44d4eeaf63a0cf6f90c7cbf3f6a5a Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 12:33:34 +0300 Subject: [PATCH 05/38] Update amneziawg.js --- .../htdocs/luci-static/resources/protocol/amneziawg.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 9e6daf44..752f05b8 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1321,8 +1321,8 @@ return network.registerProtocol("amneziawg", { var code = this.map.findElement(".qr-code"), conf = this.map.findElement(".client-config"), endpoint = this.section.getUIElement(section_id, "endpoint"), - ips = this.section.getUIElement(section_id, "allowed_ips"), - eips = this.section.getUIElement(section_id, 'addresses'), + ips = this.section.getUIElement(section_id, "allowed_ips"); + eips = this.section.getUIElement(section_id, 'addresses'); dns = this.section.getUIElement(section_id, 'dns_servers'); if (this.isValid(section_id)) { From 6f62d8f255a51d411d47de565d61f33780284735 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 12:38:02 +0300 Subject: [PATCH 06/38] Update amneziawg.js --- .../resources/protocol/amneziawg.js | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 752f05b8..694ca2dd 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1254,12 +1254,10 @@ return network.registerProtocol("amneziawg", { headNode = mapNode.parentNode.querySelector("h4"), configGenerator = this.createPeerConfig.bind(this, section_id), parent = this.map; - eips = this.section.formvalue(section_id, 'allowed_ips'); return Promise.all([ network.getWANNetworks(), network.getWAN6Networks(), - network.getNetwork('lan'), L.resolveDefault(uci.load("ddns")), L.resolveDefault(uci.load("system")), parent.save(null, true), @@ -1293,16 +1291,6 @@ return network.registerProtocol("amneziawg", { ); var ips = ["0.0.0.0/0", "::/0"]; - - var dns = []; - - var lan = data[2]; - if (lan) { - var lanIp = lan.getIPAddr(); - if (lanIp) { - dns.unshift(lanIp) - } - } var qrm, qrs, qro; @@ -1322,8 +1310,6 @@ return network.registerProtocol("amneziawg", { conf = this.map.findElement(".client-config"), endpoint = this.section.getUIElement(section_id, "endpoint"), ips = this.section.getUIElement(section_id, "allowed_ips"); - eips = this.section.getUIElement(section_id, 'addresses'); - dns = this.section.getUIElement(section_id, 'dns_servers'); if (this.isValid(section_id)) { conf.firstChild.data = configGenerator( @@ -1365,20 +1351,9 @@ return network.registerProtocol("amneziawg", { }); qro.onchange = handleConfigChange; - qro = qrs.option(form.DynamicList, "dns_servers", _("DNS Servers"), _("DNS servers for the remote clients using this tunnel to your openwrt device. Some AmneziaWG clients require this to be set.")); - qro.datatype = "ipaddr"; - qro.default = dns; - qro.onchange = handleConfigChange; - - qro = qrs.option(form.DynamicList, "addresses", _("Addresses"), _("IP addresses for the peer to use inside the tunnel. Some clients require this setting.")); - qro.datatype = 'ipaddr'; - qro.default = eips; - eips.forEach(function(eip) { qro.value(eip) }); - qro.onchange = handleConfigChange; - qro = qrs.option(form.DummyValue, "output"); qro.renderWidget = function () { - var peer_config = configGenerator(hostnames[0], ips, eips, dns); + var peer_config = configGenerator(hostnames[0], ips); var node = E( "div", From 229369a718a59e9b07bbce329c451ddcb066a54f Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 12:45:24 +0300 Subject: [PATCH 07/38] Update amneziawg.js --- .../htdocs/luci-static/resources/protocol/amneziawg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 694ca2dd..3b768274 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1295,7 +1295,7 @@ return network.registerProtocol("amneziawg", { var qrm, qrs, qro; qrm = new form.JSONMap( - { config: { endpoint: hostnames[0], allowed_ips: ips, addresses: eips, dns_servers: dns } }, + { config: { endpoint: hostnames[0], allowed_ips: ips } }, null, _( "The generated configuration can be imported into a AmneziaWG client application to set up a connection towards this device." From bdf3d1124c56ff47079a2b09e5aa5873d6ca9743 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 13:15:49 +0300 Subject: [PATCH 08/38] Update amneziawg.js --- .../resources/protocol/amneziawg.js | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index 3b768274..aa52f184 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -1253,11 +1253,13 @@ return network.registerProtocol("amneziawg", { var mapNode = ss.getActiveModalMap(), headNode = mapNode.parentNode.querySelector("h4"), configGenerator = this.createPeerConfig.bind(this, section_id), - parent = this.map; + parent = this.map, + eips = this.section.formvalue(section_id, 'allowed_ips'); return Promise.all([ network.getWANNetworks(), network.getWAN6Networks(), + network.getNetwork('lan'), L.resolveDefault(uci.load("ddns")), L.resolveDefault(uci.load("system")), parent.save(null, true), @@ -1292,10 +1294,20 @@ return network.registerProtocol("amneziawg", { var ips = ["0.0.0.0/0", "::/0"]; + var dns = []; + + var lan = data[2]; + if (lan) { + var lanIp = lan.getIPAddr(); + if (lanIp) { + dns.unshift(lanIp) + } + } + var qrm, qrs, qro; qrm = new form.JSONMap( - { config: { endpoint: hostnames[0], allowed_ips: ips } }, + { config: { endpoint: hostnames[0], allowed_ips: ips, addresses: eips, dns_servers: dns } }, null, _( "The generated configuration can be imported into a AmneziaWG client application to set up a connection towards this device." @@ -1309,12 +1321,16 @@ return network.registerProtocol("amneziawg", { var code = this.map.findElement(".qr-code"), conf = this.map.findElement(".client-config"), endpoint = this.section.getUIElement(section_id, "endpoint"), - ips = this.section.getUIElement(section_id, "allowed_ips"); + ips = this.section.getUIElement(section_id, "allowed_ips"), + eips = this.section.getUIElement(section_id, 'addresses'), + dns = this.section.getUIElement(section_id, 'dns_servers'); if (this.isValid(section_id)) { conf.firstChild.data = configGenerator( endpoint.getValue(), - ips.getValue() + ips.getValue(), + eips.getValue(), + dns.getValue() ); code.style.opacity = ".5"; @@ -1351,6 +1367,18 @@ return network.registerProtocol("amneziawg", { }); qro.onchange = handleConfigChange; + + qro = qrs.option(form.DynamicList, "dns_servers", _("DNS Servers"), _("DNS servers for the remote clients using this tunnel to your openwrt device. Some AmneziaWG clients require this to be set.")); + qro.datatype = "ipaddr"; + qro.default = dns; + qro.onchange = handleConfigChange; + + qro = qrs.option(form.DynamicList, "addresses", _("Addresses"), _("IP addresses for the peer to use inside the tunnel. Some clients require this setting.")); + qro.datatype = "ipaddr"; + qro.default = eips; + eips.forEach(function(eip) { qro.value(eip) }); + qro.onchange = handleConfigChange; + qro = qrs.option(form.DummyValue, "output"); qro.renderWidget = function () { var peer_config = configGenerator(hostnames[0], ips); From dc7de07b2bf7c1b50ec4e2fd48539782ae7b41a0 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 13:31:50 +0300 Subject: [PATCH 09/38] Fix luci-amneziawg.json --- .../root/usr/share/rpcd/acl.d/luci-amneziawg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json b/luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json index bb5dd7e2..95c27d8f 100644 --- a/luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json +++ b/luci-proto-amneziawg/root/usr/share/rpcd/acl.d/luci-amneziawg.json @@ -10,7 +10,7 @@ "getWgInstances" ] }, - "uci": [ "network" ] + "uci": [ "ddns", "system", "network" ] }, "write": { "ubus": { From 6a136f5f9ef369d6d76c6884c2cd6182ad5f2c37 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 13:34:00 +0300 Subject: [PATCH 10/38] fix qr generator amneziawg.js --- .../htdocs/luci-static/resources/protocol/amneziawg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js index aa52f184..61bc5b09 100644 --- a/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js +++ b/luci-proto-amneziawg/htdocs/luci-static/resources/protocol/amneziawg.js @@ -298,7 +298,7 @@ return network.registerProtocol("amneziawg", { return true; }; - // AmneziaWG + // AmneziaWG Settings try { s.tab( From 15d728811f1ebce77e110da374d15eb5bce0c5a1 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 23:30:40 +0300 Subject: [PATCH 11/38] Update amneziawg.sh --- amneziawg-tools/files/amneziawg.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/amneziawg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh index 39e2017f..9baed67f 100755 --- a/amneziawg-tools/files/amneziawg.sh +++ b/amneziawg-tools/files/amneziawg.sh @@ -2,8 +2,6 @@ # Copyright 2016-2017 Dan Luedtke # Licensed to the public under the Apache License 2.0. -# shellcheck disable=SC1091,SC3003,SC3043 - WG=/usr/bin/awg if [ ! -x $WG ]; then logger -t "amneziawg" "error: missing amneziawg-tools (${WG})" @@ -30,9 +28,7 @@ proto_amneziawg_init_config() { proto_config_add_int "awg_h2" proto_config_add_int "awg_h3" proto_config_add_int "awg_h4" -# shellcheck disable=SC2034 available=1 -# shellcheck disable=SC2034 no_proto_task=1 } From 5a3a100caff039d0dc6f9d9ee3b4765cf56f3650 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 23:35:33 +0300 Subject: [PATCH 12/38] Update amneziawg.sh --- amneziawg-tools/files/amneziawg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh index 9baed67f..d24ef507 100755 --- a/amneziawg-tools/files/amneziawg.sh +++ b/amneziawg-tools/files/amneziawg.sh @@ -135,7 +135,7 @@ ensure_key_is_generated() { local private_key private_key="$(uci get network."$1".private_key)" - if [ "$private_key" = "generate" ]; then + if [ "$private_key" == "generate" ]; then local ucitmp oldmask="$(umask)" umask 077 From 170b6a99db7baf1efbefae04fbbecacdb0f6852d Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 23:44:23 +0300 Subject: [PATCH 13/38] Update amneziawg.sh --- amneziawg-tools/files/amneziawg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh index d24ef507..a957223c 100755 --- a/amneziawg-tools/files/amneziawg.sh +++ b/amneziawg-tools/files/amneziawg.sh @@ -197,7 +197,7 @@ proto_amneziawg_setup() { if proto_amneziawg_is_kernel_mode; then logger -t "amneziawg" "info: using kernel-space kmod-amneziawg for ${WG}" - ip link del dev "${config}" 2>/dev/null + ip link del dev "${config}" 2>/dev/null ip link add dev "${config}" type amneziawg else logger -t "amneziawg" "info: using user-space amneziawg-go for ${WG}" From f31e8201295ab7e9de06d63870a077576b872d6e Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Thu, 22 Aug 2024 23:51:43 +0300 Subject: [PATCH 14/38] Update amneziawg.sh --- amneziawg-tools/files/amneziawg.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/amneziawg-tools/files/amneziawg.sh b/amneziawg-tools/files/amneziawg.sh index a957223c..472d3d36 100755 --- a/amneziawg-tools/files/amneziawg.sh +++ b/amneziawg-tools/files/amneziawg.sh @@ -287,8 +287,7 @@ proto_amneziawg_setup() { # endpoint dependency if [ "${nohostroute}" != "1" ]; then -# shellcheck disable=SC2034 - ${WG} show "${config}" endpoints | \ + awg show "${config}" endpoints | \ sed -E 's/\[?([0-9.:a-f]+)\]?:([0-9]+)/\1 \2/' | \ while IFS=$'\t ' read -r key address port; do [ -n "${port}" ] || continue From 2d1306b1b5c05a7dabb796152e83534fae16891b Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:17:10 +0300 Subject: [PATCH 15/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 2 -- 1 file changed, 2 deletions(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 76f6bb94..fb17520a 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -11,8 +11,6 @@ # Run this script from cron every minute: # echo '* * * * * /usr/bin/wireguard_watchdog' >> /etc/crontabs/root -# shellcheck disable=SC1091,SC3043 - . /lib/functions.sh check_peer_activity() { From ad2e484e8215fb348b369d306f4d79c39072edcd Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:19:51 +0300 Subject: [PATCH 16/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index fb17520a..470cb1e8 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -11,6 +11,7 @@ # Run this script from cron every minute: # echo '* * * * * /usr/bin/wireguard_watchdog' >> /etc/crontabs/root + . /lib/functions.sh check_peer_activity() { @@ -44,9 +45,8 @@ check_peer_activity() { # check taken from packages/net/ddns-scripts/files/dynamic_dns_functions.sh local IPV4_REGEX="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}" local IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)" - local IPV4 IPV6 - IPV4="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV4_REGEX$")" # do not detect ip in 0.0.0.0.example.com - IPV6="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV6_REGEX")" + local IPV4="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV4_REGEX$")" # do not detect ip in 0.0.0.0.example.com + local IPV6="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV6_REGEX")" [ -n "${IPV4}${IPV6}" ] && return 0; # re-resolve endpoint hostname if not responding for too long From c487c1e350f3887450893b2837550c0b91575092 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:21:12 +0300 Subject: [PATCH 17/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 470cb1e8..647a1009 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -47,7 +47,7 @@ check_peer_activity() { local IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)" local IPV4="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV4_REGEX$")" # do not detect ip in 0.0.0.0.example.com local IPV6="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV6_REGEX")" - [ -n "${IPV4}${IPV6}" ] && return 0; + [ -n "${IPV4} -o -n ${IPV6}" ] && return 0; # re-resolve endpoint hostname if not responding for too long last_handshake=$(awg show "${iface}" latest-handshakes | grep "${public_key}" | awk '{print $2}') From 26472d4573dd248cfd822a6260b56af0aee58d07 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:21:38 +0300 Subject: [PATCH 18/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 647a1009..974402a6 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -47,7 +47,7 @@ check_peer_activity() { local IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)" local IPV4="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV4_REGEX$")" # do not detect ip in 0.0.0.0.example.com local IPV6="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV6_REGEX")" - [ -n "${IPV4} -o -n ${IPV6}" ] && return 0; + [ -n "${IPV4} -o -n "${IPV6}" ] && return 0; # re-resolve endpoint hostname if not responding for too long last_handshake=$(awg show "${iface}" latest-handshakes | grep "${public_key}" | awk '{print $2}') From 14b9bc516a6f985000517c8199ea11eef11b7ac3 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:21:54 +0300 Subject: [PATCH 19/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 974402a6..8dbeb48e 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -47,7 +47,7 @@ check_peer_activity() { local IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)" local IPV4="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV4_REGEX$")" # do not detect ip in 0.0.0.0.example.com local IPV6="$(echo "${endpoint_host}" | grep -m 1 -o "$IPV6_REGEX")" - [ -n "${IPV4} -o -n "${IPV6}" ] && return 0; + [ -n "${IPV4}" -o -n "${IPV6}" ] && return 0; # re-resolve endpoint hostname if not responding for too long last_handshake=$(awg show "${iface}" latest-handshakes | grep "${public_key}" | awk '{print $2}') From 9a6427140d7f6744c60b3559fa66a93423a2a072 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:22:46 +0300 Subject: [PATCH 20/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 8dbeb48e..7fb304b1 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -52,7 +52,7 @@ check_peer_activity() { # re-resolve endpoint hostname if not responding for too long last_handshake=$(awg show "${iface}" latest-handshakes | grep "${public_key}" | awk '{print $2}') [ -z "${last_handshake}" ] && return 0; - idle_seconds=$(($(date +%s)-last_handshake)) + idle_seconds=$(($(date +%s)-${last_handshake})) [ ${idle_seconds} -lt 150 ] && return 0; logger -t "amneziawg_monitor" "${iface} endpoint ${endpoint_host}:${endpoint_port} is not responding for ${idle_seconds} seconds, trying to re-resolve hostname" awg set "${iface}" peer "${public_key}" endpoint "${endpoint_host}:${endpoint_port}" From 50e894191b1401bcd44f475cfad1bdbf2bcfdfba Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:23:26 +0300 Subject: [PATCH 21/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 7fb304b1..12883c68 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -52,7 +52,7 @@ check_peer_activity() { # re-resolve endpoint hostname if not responding for too long last_handshake=$(awg show "${iface}" latest-handshakes | grep "${public_key}" | awk '{print $2}') [ -z "${last_handshake}" ] && return 0; - idle_seconds=$(($(date +%s)-${last_handshake})) + idle_seconds=$(($(date +%s)-"${last_handshake}")) [ ${idle_seconds} -lt 150 ] && return 0; logger -t "amneziawg_monitor" "${iface} endpoint ${endpoint_host}:${endpoint_port} is not responding for ${idle_seconds} seconds, trying to re-resolve hostname" awg set "${iface}" peer "${public_key}" endpoint "${endpoint_host}:${endpoint_port}" From 48f3e541554b87f400becf65d1faac5c6632650b Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:32:14 +0300 Subject: [PATCH 22/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 1 + 1 file changed, 1 insertion(+) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 12883c68..7922c72f 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -60,6 +60,7 @@ check_peer_activity() { # query ubus for all active wireguard interfaces wg_ifaces=$(ubus -S call network.interface dump | jsonfilter -e '@.interface[@.up=true]' | jsonfilter -a -e '@[@.proto="amneziawg"].interface' | tr "\n" " ") +eval "${wg_ifaces}" # check every peer in every active wireguard interface config_load network From e4bf85d317ed1028459886706ecc05526771353b Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:32:28 +0300 Subject: [PATCH 23/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 1 - 1 file changed, 1 deletion(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index 7922c72f..b0100c01 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -11,7 +11,6 @@ # Run this script from cron every minute: # echo '* * * * * /usr/bin/wireguard_watchdog' >> /etc/crontabs/root - . /lib/functions.sh check_peer_activity() { From fb7c0cdfb22496082ce78fc124f4d344e482252e Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:37:27 +0300 Subject: [PATCH 24/38] Update amneziawg_watchdog --- amneziawg-tools/files/amneziawg_watchdog | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/amneziawg-tools/files/amneziawg_watchdog b/amneziawg-tools/files/amneziawg_watchdog index b0100c01..da6c514d 100755 --- a/amneziawg-tools/files/amneziawg_watchdog +++ b/amneziawg-tools/files/amneziawg_watchdog @@ -58,8 +58,7 @@ check_peer_activity() { } # query ubus for all active wireguard interfaces -wg_ifaces=$(ubus -S call network.interface dump | jsonfilter -e '@.interface[@.up=true]' | jsonfilter -a -e '@[@.proto="amneziawg"].interface' | tr "\n" " ") -eval "${wg_ifaces}" +eval $(ubus -S call network.interface dump | jsonfilter -e 'wg_ifaces=@.interface[@.up=true && @.proto="amneziawg"].interface') # check every peer in every active wireguard interface config_load network From 5de934a9c9acc3f34ba2d4335954a7ec5d827c3b Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:45:39 +0300 Subject: [PATCH 25/38] Update 000-initial-amneziawg.patch --- kmod-amneziawg/files/000-initial-amneziawg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmod-amneziawg/files/000-initial-amneziawg.patch b/kmod-amneziawg/files/000-initial-amneziawg.patch index de8d0c1f..87fc4ed6 100644 --- a/kmod-amneziawg/files/000-initial-amneziawg.patch +++ b/kmod-amneziawg/files/000-initial-amneziawg.patch @@ -225,7 +225,7 @@ index 5506738..b45253d 100644 goto err_netlink; - pr_info("WireGuard " WIREGUARD_VERSION " loaded. See www.wireguard.com for information.\n"); -+ pr_info("WireGuard " WIREGUARD_VERSION " (Amnezia VPN) loaded. See www.wireguard.com for information.\n"); ++ pr_info("WireGuard " WIREGUARD_VERSION " (AmneziaWG) loaded. See www.amnezia.org for information.\n"); pr_info("Copyright (C) 2015-2019 Jason A. Donenfeld . All Rights Reserved.\n"); return 0; From 4453a1745db01f9e184e44de615668dab0ee6370 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 00:47:19 +0300 Subject: [PATCH 26/38] Update 000-initial-amneziawg.patch --- kmod-amneziawg/files/000-initial-amneziawg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmod-amneziawg/files/000-initial-amneziawg.patch b/kmod-amneziawg/files/000-initial-amneziawg.patch index 87fc4ed6..13306062 100644 --- a/kmod-amneziawg/files/000-initial-amneziawg.patch +++ b/kmod-amneziawg/files/000-initial-amneziawg.patch @@ -234,7 +234,7 @@ index 5506738..b45253d 100644 module_exit(wg_mod_exit); MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("WireGuard secure network tunnel"); -+MODULE_DESCRIPTION("WireGuard (Amnezia VPN) secure network tunnel"); ++MODULE_DESCRIPTION("WireGuard (AmneziaWG) secure network tunnel"); MODULE_AUTHOR("Jason A. Donenfeld "); MODULE_VERSION(WIREGUARD_VERSION); MODULE_ALIAS_RTNL_LINK(KBUILD_MODNAME); From fc70099bfee2e194b67dd4de25f5cd6380bd4ad1 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 10:08:49 +0300 Subject: [PATCH 27/38] Update Makefile --- kmod-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmod-amneziawg/Makefile b/kmod-amneziawg/Makefile index 3845b8a7..9ca8e59c 100644 --- a/kmod-amneziawg/Makefile +++ b/kmod-amneziawg/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-amneziawg -PKG_VERSION:=0.0.1 +PKG_VERSION:=1.0.0 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk From a5c6e6c312893b725a19ab6b28a8e395f49b0c9d Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 10:26:18 +0300 Subject: [PATCH 28/38] Update Makefile --- luci-proto-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index 8d2dedfb..a9e4d001 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Amnezia Admin -PKG_VERSION:=0.0.1-1 +PKG_VERSION:=1.0.0-1 LUCI_TITLE:=AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode From d30791456bd5b8d8de227cfd3d8989c5dc59d160 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 16:16:38 +0300 Subject: [PATCH 29/38] fix Makefile --- kmod-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmod-amneziawg/Makefile b/kmod-amneziawg/Makefile index 9ca8e59c..855e6fb1 100644 --- a/kmod-amneziawg/Makefile +++ b/kmod-amneziawg/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/amneziawg SECTION:=kernel - CATEGORY:=Kernel Modules + CATEGORY:=Kernel modules SUBMENU:=Network Support URL:=https://amnezia.org/ MAINTAINER:=Amnezia Admin From 4ea8a53c04e4f9500445c52825dabf80520b4939 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 16:28:45 +0300 Subject: [PATCH 30/38] Fix Makefile --- amneziawg-go/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-go/Makefile b/amneziawg-go/Makefile index 18238ba2..b655038c 100644 --- a/amneziawg-go/Makefile +++ b/amneziawg-go/Makefile @@ -27,7 +27,7 @@ include ../../packages/lang/golang/golang-package.mk define Package/amneziawg-go SECTION:=net CATEGORY:=Network - TITLE:=amneziawg-go + TITLE:=AmneziaWG-go userspace implementation DEPENDS:=$(GO_ARCH_DEPENDS) endef From 22dd3aac4991fb6fd2848105ad25eb1cdde18e41 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Fri, 23 Aug 2024 16:31:26 +0300 Subject: [PATCH 31/38] Fix Makefile --- amneziawg-go/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amneziawg-go/Makefile b/amneziawg-go/Makefile index b655038c..8a4baea5 100644 --- a/amneziawg-go/Makefile +++ b/amneziawg-go/Makefile @@ -27,7 +27,7 @@ include ../../packages/lang/golang/golang-package.mk define Package/amneziawg-go SECTION:=net CATEGORY:=Network - TITLE:=AmneziaWG-go userspace implementation + TITLE:=AmneziaWG userspace implementation program (amneziawg-go) DEPENDS:=$(GO_ARCH_DEPENDS) endef From 9b8acf064f2938c3dcc2a079802a2473c73c1352 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Mon, 26 Aug 2024 13:43:00 +0300 Subject: [PATCH 32/38] Fix Makefile Fix Makefile --- amneziawg-tools/Makefile | 2 +- kmod-amneziawg/Makefile | 2 +- luci-proto-amneziawg/Makefile | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/amneziawg-tools/Makefile b/amneziawg-tools/Makefile index 993daa7c..a4ec3bba 100644 --- a/amneziawg-tools/Makefile +++ b/amneziawg-tools/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=amneziawg-tools PKG_VERSION:=1.0.20240213 -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/amnezia-vpn/amneziawg-tools/archive/refs/tags/ diff --git a/kmod-amneziawg/Makefile b/kmod-amneziawg/Makefile index 855e6fb1..cdd60778 100644 --- a/kmod-amneziawg/Makefile +++ b/kmod-amneziawg/Makefile @@ -4,7 +4,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-amneziawg PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) include $(INCLUDE_DIR)/package.mk diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index a9e4d001..93ee0c69 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -7,7 +7,8 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Amnezia Admin -PKG_VERSION:=1.0.0-1 +PKG_VERSION:=1.0.0 +PKG_RELEASE:=$(AUTORELEASE) LUCI_TITLE:=AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode From 9bdc726db64dd39c6ecba943f726b320f5b65a5a Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Mon, 26 Aug 2024 13:55:28 +0300 Subject: [PATCH 33/38] Fix Makefile --- luci-proto-amneziawg/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index 93ee0c69..df4d9847 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -7,8 +7,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Amnezia Admin -PKG_VERSION:=1.0.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.0.0-$(AUTORELEASE) LUCI_TITLE:=AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode From 862e770ade50321b2741e2da5a86d7f52abbc6fc Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Mon, 26 Aug 2024 14:03:20 +0300 Subject: [PATCH 34/38] Fix Makefile --- luci-proto-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index df4d9847..32b64a37 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Amnezia Admin -PKG_VERSION:=1.0.0-$(AUTORELEASE) +PKG_VERSION:=1.0.0-r$(AUTORELEASE) LUCI_TITLE:=AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode From 3af778bf593a8ff3d1eaabba5891eef6cd76ee76 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Tue, 27 Aug 2024 14:06:49 +0300 Subject: [PATCH 35/38] Update Makefile --- luci-proto-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index 32b64a37..df4d9847 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Amnezia Admin -PKG_VERSION:=1.0.0-r$(AUTORELEASE) +PKG_VERSION:=1.0.0-$(AUTORELEASE) LUCI_TITLE:=AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode From 91e60e8cf6f944018526719286774431745782cb Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Tue, 27 Aug 2024 14:21:43 +0300 Subject: [PATCH 36/38] update Makefile --- luci-proto-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index df4d9847..be07ccbb 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_MAINTAINER:=Amnezia Admin PKG_VERSION:=1.0.0-$(AUTORELEASE) -LUCI_TITLE:=AmneziaWG Web UI +LUCI_TITLE:=Support for AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode LUCI_PKGARCH:=all From d7657ac98d930da2e38ffebe7ff44a5e74586a02 Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Tue, 27 Aug 2024 15:13:09 +0300 Subject: [PATCH 37/38] Update workflow --- .github/workflows/openwrt-awg.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/openwrt-awg.yml b/.github/workflows/openwrt-awg.yml index e92cebb3..5581e373 100644 --- a/.github/workflows/openwrt-awg.yml +++ b/.github/workflows/openwrt-awg.yml @@ -36,7 +36,7 @@ jobs: rm -rf bin/targets/${target}/${subtarget}/packages/ || true wget https://downloads.openwrt.org/releases/${{ matrix.tag }}/targets/${target}/${subtarget}/feeds.buildinfo -O feeds.conf - echo "src-git awgopenwrt https://github.com/lolo6oT/awg-openwrt.git;dev" >> ./feeds.conf + echo "src-git awgopenwrt https://github.com/lolo6oT/awg-openwrt.git;dev-23.05" >> ./feeds.conf ./scripts/feeds update -a ./scripts/feeds install -a diff --git a/README.md b/README.md index b80935a0..94e94ffd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Amnezia ipk's files for OpenWRT Mediatek Filogic +Amnezia ipk's files for OpenWRT-23.05 Mediatek Filogic - Required packages and lib for runner or build machine https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem - For arm64 runner or build machine need external go bootstrap https://go.dev/doc/install From 3a858f25807c399864702b75f75084678ce0209e Mon Sep 17 00:00:00 2001 From: lolo6oT Date: Tue, 27 Aug 2024 22:13:17 +0300 Subject: [PATCH 38/38] Update Makefile --- luci-proto-amneziawg/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/luci-proto-amneziawg/Makefile b/luci-proto-amneziawg/Makefile index be07ccbb..14fe7320 100644 --- a/luci-proto-amneziawg/Makefile +++ b/luci-proto-amneziawg/Makefile @@ -10,7 +10,7 @@ PKG_MAINTAINER:=Amnezia Admin PKG_VERSION:=1.0.0-$(AUTORELEASE) LUCI_TITLE:=Support for AmneziaWG Web UI LUCI_DESCRIPTION:=Provides Web UI for AmneziaWG -LUCI_DEPENDS:=+luci-base +amneziawg-tools +ucode +LUCI_DEPENDS:=+amneziawg-tools +ucode LUCI_PKGARCH:=all PKG_PROVIDES:=luci-proto-amneziawg