diff --git a/gluon_patches/0001-add-gluon-geolocator.patch b/gluon_patches/0001-add-gluon-geolocator.patch index e2d63063c5a2ed1dad676158388d7eff3978deca..f8f94e46426e5f1a555d3988b79e65440e9c21b5 100644 --- a/gluon_patches/0001-add-gluon-geolocator.patch +++ b/gluon_patches/0001-add-gluon-geolocator.patch @@ -1,4 +1,4 @@ -From 6f6e487129eb970a0a8e29e1eada1c24f5b2f0d7 Mon Sep 17 00:00:00 2001 +From a5568b3b4a739742afca536781127bf67353fb72 Mon Sep 17 00:00:00 2001 From: runner01 <runner01@ffnw.de> Date: Fri, 8 Feb 2019 04:43:50 +0100 Subject: [PATCH 1/4] add gluon-geolocator diff --git a/gluon_patches/0002-add-gluon-hoodselector-Integrate-VPN-Mode.patch b/gluon_patches/0002-add-gluon-hoodselector-Integrate-VPN-Mode.patch index 80cf108ba930d92ec19248df0ce407920a2919a7..60eb9d61d65e835892a465977d921473ebf046e6 100644 --- a/gluon_patches/0002-add-gluon-hoodselector-Integrate-VPN-Mode.patch +++ b/gluon_patches/0002-add-gluon-hoodselector-Integrate-VPN-Mode.patch @@ -1,4 +1,4 @@ -From c1f839edd712e11fe536eb2f201f72beaebf2c12 Mon Sep 17 00:00:00 2001 +From 170e8f72abd2d73528fcb571b8c25c2c214461f1 Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt <tarek@ring0.de> Date: Sat, 12 May 2018 17:48:32 +0200 Subject: [PATCH 2/4] add gluon-hoodselector: Integrate VPN Mode diff --git a/gluon_patches/0003-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch b/gluon_patches/0003-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch index 855a4c766dfa5417c96885a97ecb41489f3b7ded..a155eaba31f0ac6576753a0fbd855ccf3ac654d3 100644 --- a/gluon_patches/0003-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch +++ b/gluon_patches/0003-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch @@ -1,4 +1,4 @@ -From 7311dc942ff831e6ecf8da9e0e98e0b2c7436264 Mon Sep 17 00:00:00 2001 +From 262cac96cf2875b0344adc4dc80dbf127345eb3a 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/4] ffnw config migration from gluon-node-info to geolocator diff --git a/gluon_patches/0004-hoodselector-to-domain-migration.patch b/gluon_patches/0004-hoodselector-to-domain-migration.patch index 2b5839091e284a5cd72b174ec5e4c8a2bb7eb798..88b3bafba3b5fc511394cfa6f1699dbc105345ea 100644 --- a/gluon_patches/0004-hoodselector-to-domain-migration.patch +++ b/gluon_patches/0004-hoodselector-to-domain-migration.patch @@ -1,19 +1,22 @@ -From b567bcfd9266c94ec0c81b06eb19ef698fd47457 Mon Sep 17 00:00:00 2001 +From ff190d99d664cd5e641d878ce6565f71b5b912c8 Mon Sep 17 00:00:00 2001 From: runner01 <runner01@ffnw.de> Date: Mon, 18 Mar 2019 21:29:26 +0100 Subject: [PATCH 4/4] hoodselector to domain migration +Domain migration: restart services after migration + +Signed-off-by: runner01 <runner01@ffnw.de> --- - .../luasrc/lib/gluon/upgrade/010-domain-migrate | 37 ++++++++++++++++++++++ - 1 file changed, 37 insertions(+) + .../luasrc/lib/gluon/upgrade/010-domain-migrate | 38 ++++++++++++++++++++++ + 1 file changed, 38 insertions(+) create mode 100644 package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate diff --git a/package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate b/package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate new file mode 100644 -index 00000000..d230c529 +index 00000000..9146970b --- /dev/null +++ b/package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate -@@ -0,0 +1,37 @@ +@@ -0,0 +1,38 @@ +#!/usr/bin/lua + +local uci = require('simple-uci').cursor() @@ -49,6 +52,7 @@ index 00000000..d230c529 + print(new_domain.domain_code) + hoodutil.set_domain_config(new_domain) + os.execute("rm /etc/config/hoodselector") ++ hoodutil.restart_services() + end +end --