firewall: run the firewall conf migration before running nftable's re…

…genconf
YunoHost · Feb 25, 2025 · 8720d93 · 8720d93
1 parent 3117810
commit 8720d93
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/tools.py b/src/tools.py
@@ -305,6 +305,14 @@ def tools_regen_conf(
 
     from yunohost.regenconf import regen_conf
 
+    if (names == [] or "nftables" in names) and tools_migrations_state()["migrations"].get("0032_firewall_config") not in ["skipped", "done"]:
+        # Make sure the firewall conf is migrated before running the regenconf,
+        # otherwise the nftable regenconf wont work
+        try:
+            tools_migrations_run(["0032_firewall_config"])
+        except Exception as e:
+            logger.error(e)
+
     return regen_conf(names, with_diff, force, dry_run, list_pending)