From 71d4b5a97bbedfb3564389abd5c58eb70ef560b5 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:20:03 +0100 Subject: [PATCH 1/2] firmware: show legacy part of folder at the end --- nginx/domains/firmware.ffmuc.net.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nginx/domains/firmware.ffmuc.net.conf b/nginx/domains/firmware.ffmuc.net.conf index 984f0d5..07f718c 100644 --- a/nginx/domains/firmware.ffmuc.net.conf +++ b/nginx/domains/firmware.ffmuc.net.conf @@ -79,10 +79,10 @@ server { # Add Gluon releases here that allow an upgrade path to the latest version # https://github.com/freifunk-gluon/gluon/wiki/Release-life-cycle#migration-paths-diagram set $gluon_v2019_1_x "gluon-v2021.1.x"; # we want routers to upgrade from v2019 to v2021 and only then attempt v2023 - set $gluon_v2021_1_x "gluon-v2021.1.x_v2023.1.x"; - set $gluon_v2022_1_x "gluon-v2023.1.x_v2023.2.x"; - set $gluon_v2023_1_x "gluon-v2023.1.x_v2023.2.x"; - set $gluon_v2023_2_x "gluon-v2023.1.x_v2023.2.x"; + set $gluon_v2021_1_x "gluon-v2023.1.x_v2021.1.x"; + set $gluon_v2022_1_x "gluon-v2023.2.x_v2023.1.x"; + set $gluon_v2023_1_x "gluon-v2023.2.x_v2023.1.x"; + set $gluon_v2023_2_x "gluon-v2023.2.x_v2023.1.x"; set $gluon_next "gluon-next"; if ($targetDirectory = "keep") { From 773a1087e371bc4af258fdc76b908dc946b2034b Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Tue, 17 Dec 2024 11:20:58 +0100 Subject: [PATCH 2/2] firmware: do not upgrade APs to v2023.2.x yet --- nginx/domains/firmware.ffmuc.net.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/domains/firmware.ffmuc.net.conf b/nginx/domains/firmware.ffmuc.net.conf index 07f718c..817fe7c 100644 --- a/nginx/domains/firmware.ffmuc.net.conf +++ b/nginx/domains/firmware.ffmuc.net.conf @@ -80,8 +80,8 @@ server { # https://github.com/freifunk-gluon/gluon/wiki/Release-life-cycle#migration-paths-diagram set $gluon_v2019_1_x "gluon-v2021.1.x"; # we want routers to upgrade from v2019 to v2021 and only then attempt v2023 set $gluon_v2021_1_x "gluon-v2023.1.x_v2021.1.x"; - set $gluon_v2022_1_x "gluon-v2023.2.x_v2023.1.x"; - set $gluon_v2023_1_x "gluon-v2023.2.x_v2023.1.x"; + set $gluon_v2022_1_x "gluon-v2023.1.x_v2021.1.x"; + set $gluon_v2023_1_x "gluon-v2023.1.x_v2021.1.x"; set $gluon_v2023_2_x "gluon-v2023.2.x_v2023.1.x"; set $gluon_next "gluon-next";