From ba4830f275a9e9b93cea1ce1b51d9374aeff0909 Mon Sep 17 00:00:00 2001
From: Grische <2787581+grische@users.noreply.github.com>
Date: Fri, 3 Jan 2025 14:08:23 +0100
Subject: [PATCH 1/2] firmware: add new v2025 releases

---
 nginx/domains/firmware.ffmuc.net.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nginx/domains/firmware.ffmuc.net.conf b/nginx/domains/firmware.ffmuc.net.conf
index 5b2c5eb..eca5edd 100644
--- a/nginx/domains/firmware.ffmuc.net.conf
+++ b/nginx/domains/firmware.ffmuc.net.conf
@@ -37,9 +37,10 @@ map $firmwareVersion $targetDirectory {
     # OpenWrt 23.05
     "~^2023\.12\.2-next$"               $gluon_v2023_2_x;
     "~^2024\.([0-9]|10|11)\.\d+-next$"  $gluon_v2023_2_x;
+    "~^2025\.\d+\.\d+$"                 $gluon_v2023_2_x;
 
     # OpenWrt 24.10
-    # TBD
+    "~^2025\.\d+\.\d+-next$"            $gluon_next;
 
     # Else keep requested branch folder
     default              "keep";

From c5af226e6dfdb369766a65b140ace42c332b4c63 Mon Sep 17 00:00:00 2001
From: Grische <2787581+grische@users.noreply.github.com>
Date: Fri, 3 Jan 2025 19:54:44 +0100
Subject: [PATCH 2/2] firmware: fix and simplify v2024 matching

---
 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 eca5edd..b0ac4cf 100644
--- a/nginx/domains/firmware.ffmuc.net.conf
+++ b/nginx/domains/firmware.ffmuc.net.conf
@@ -32,11 +32,11 @@ map $firmwareVersion $targetDirectory {
 
     # OpenWRT 22.03 (still)
     "~^2023\.(8|11)\."                  $gluon_v2023_1_x;
-    "~^2024\.([0-9]|10|11])\.\d+$"      $gluon_v2023_1_x;
+    "~^2024\.\d+\.\d+$"                 $gluon_v2023_1_x;
 
     # OpenWrt 23.05
     "~^2023\.12\.2-next$"               $gluon_v2023_2_x;
-    "~^2024\.([0-9]|10|11)\.\d+-next$"  $gluon_v2023_2_x;
+    "~^2024\.\d+\.\d+-next$"            $gluon_v2023_2_x;
     "~^2025\.\d+\.\d+$"                 $gluon_v2023_2_x;
 
     # OpenWrt 24.10