Commit cdb9ae80 authored by Jan-Tarek Butt's avatar Jan-Tarek Butt

Update Gluon patches

Signed-off-by: Jan-Tarek Butt's avatarJan-Tarek Butt <tarek@ring0.de>
parent 1997315c
From 7944b7c6e627ddbfbc54b8c0238b5807de039ebe Mon Sep 17 00:00:00 2001
From 1adb8a7580770753e4d7699ad14b78aeb84849e1 Mon Sep 17 00:00:00 2001
From: runner01 <runner01@ffnw.de>
Date: Fri, 8 Feb 2019 04:43:50 +0100
Subject: [PATCH 1/5] add gluon-geolocator
Subject: [PATCH 1/6] add gluon-geolocator
---
package/gluon-geolocator/Makefile | 14 +++
......
From a41530ada3b1f14d36bfce80ff7f05fb67d4ee28 Mon Sep 17 00:00:00 2001
From 1d6ac5568a78851d31b1d37d7c28d0aa1173b24c Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Sun, 25 Feb 2018 08:42:42 +0100
Subject: [PATCH 3/5] ffnw config migration from gluon-node-info to geolocator
Subject: [PATCH 2/6] ffnw config migration from gluon-node-info to geolocator
Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
---
......
From 363c606d384218b0a3741c0aa1c8e53a02d1cab8 Mon Sep 17 00:00:00 2001
From 997eb13de13cb1096410e302b21d0e36d5edef5e Mon Sep 17 00:00:00 2001
From: runner01 <runner01@ffnw.de>
Date: Mon, 18 Mar 2019 21:29:26 +0100
Subject: [PATCH 4/5] hoodselector to domain migration
Subject: [PATCH 4/6] hoodselector to domain migration
Domain migration: restart services after migration
......
From d7ca6015474a2197686c4026ff091f504435fbbc Mon Sep 17 00:00:00 2001
From: Tata <tarek@ring0.de>
Date: Tue, 23 Apr 2019 17:34:49 +0200
Subject: [PATCH 5/6] Add mechanism to reload domain related services (#1710)
---
package/gluon-core/files/lib/gluon/reload.d/500-core | 2 ++
package/gluon-core/files/usr/bin/gluon-reload | 17 +++++++++++++++++
.../files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop | 2 ++
.../files/lib/gluon/reload.d/800-mesh-vpn-fastd-start | 2 ++
.../lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop | 2 ++
.../lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start | 2 ++
.../files/lib/gluon/reload.d/100-respondd-stop | 2 ++
.../files/lib/gluon/reload.d/900-respondd-start | 2 ++
8 files changed, 31 insertions(+)
create mode 100755 package/gluon-core/files/lib/gluon/reload.d/500-core
create mode 100755 package/gluon-core/files/usr/bin/gluon-reload
create mode 100755 package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop
create mode 100755 package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start
create mode 100755 package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop
create mode 100755 package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start
create mode 100755 package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop
create mode 100755 package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start
diff --git a/package/gluon-core/files/lib/gluon/reload.d/500-core b/package/gluon-core/files/lib/gluon/reload.d/500-core
new file mode 100755
index 00000000..bc864087
--- /dev/null
+++ b/package/gluon-core/files/lib/gluon/reload.d/500-core
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/network restart
diff --git a/package/gluon-core/files/usr/bin/gluon-reload b/package/gluon-core/files/usr/bin/gluon-reload
new file mode 100755
index 00000000..805f4201
--- /dev/null
+++ b/package/gluon-core/files/usr/bin/gluon-reload
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd "/lib/gluon/reload.d" || exit 1
+
+err=0
+
+for script in *; do
+ echo "Reloading: ${script}"
+ ./"$script" || err=1
+done
+
+if [ $err -eq 1 ]; then
+ echo 'One or more daemons failed to reload.' >&2
+ exit 1
+fi
+
+exit 0
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop
new file mode 100755
index 00000000..9e860c40
--- /dev/null
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/200-mesh-vpn-fastd-stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/fastd stop
diff --git a/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start
new file mode 100755
index 00000000..e8aad1e6
--- /dev/null
+++ b/package/gluon-mesh-vpn-fastd/files/lib/gluon/reload.d/800-mesh-vpn-fastd-start
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/fastd start
diff --git a/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop
new file mode 100755
index 00000000..651530b2
--- /dev/null
+++ b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/200-mesh-vpn-tunneldigger-stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/tunneldigger stop
diff --git a/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start
new file mode 100755
index 00000000..9b174f17
--- /dev/null
+++ b/package/gluon-mesh-vpn-tunneldigger/files/lib/gluon/reload.d/800-mesh-vpn-tunneldigger-start
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/tunneldigger start
diff --git a/package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop b/package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop
new file mode 100755
index 00000000..f7283238
--- /dev/null
+++ b/package/gluon-respondd/files/lib/gluon/reload.d/100-respondd-stop
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/gluon-respondd stop
diff --git a/package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start b/package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start
new file mode 100755
index 00000000..3890bd77
--- /dev/null
+++ b/package/gluon-respondd/files/lib/gluon/reload.d/900-respondd-start
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/gluon-respondd start
--
2.11.0
From e473b36cd9bf9902f16ce6d7e568ec183208a38c Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Sat, 23 Mar 2019 17:59:55 +0100
Subject: [PATCH 5/5] gluon-config-mode-mesh-vpn: 0300-mesh-vpn.lua fix
limit_ingress default value in case of default disabled simple-tc for
tunneldigger
Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
---
.../luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
index 0fd6432b..b11c105a 100644
--- a/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
+++ b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/wizard/0300-mesh-vpn.lua
@@ -48,10 +48,13 @@ return function(form, uci)
o = s:option(Value, "limit_ingress", pkg_i18n.translate("Downstream (kbit/s)"))
o:depends(limit, true)
+ o.default = uci:get("simple-tc", "mesh_vpn", "limit_ingress")
if has_tunneldigger then
- o.default = uci:get("tunneldigger", "mesh_vpn", "limit_bw_down")
- else
- o.default = uci:get("simple-tc", "mesh_vpn", "limit_ingress")
+ -- Check if limit_bw_down exsist if not take value vom limit_ingress
+ local limit_bw_down = uci:get("tunneldigger", "mesh_vpn", "limit_bw_down")
+ if limit_bw_down ~= nil then
+ o.default = limit_bw_down
+ end
end
o.datatype = "uinteger"
function o:write(data)
--
2.11.0
From d710cbe84fa44068ca349bd22ab36e2970431e0f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 May 2019 16:19:28 +0200
Subject: [PATCH 6/6] modules: update Gluon packages
9a364fb8d0a4 respondd: fix crash caused by division by zero
67177de99afc libs/lua-math-polygon: add add math lib for gauss jordan Ponit in Polygon algorithm
Fixes #1717
---
modules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules b/modules
index afea0830..f76a773b 100644
--- a/modules
+++ b/modules
@@ -17,4 +17,4 @@ PACKAGES_LUCI_BRANCH=openwrt-18.06
PACKAGES_LUCI_COMMIT=4ba85e3d82b684262c570e38a72d2dc3bb712a13
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=a52d5ced54acfe399b3ac36b33d53034f341f06b
+PACKAGES_GLUON_COMMIT=9a364fb8d0a4f9fecb6a3aac7525fedf759fe81a
--
2.11.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment