From 75da2ddca4ae9f6622ebe3217d50b7509f6c9f61 Mon Sep 17 00:00:00 2001
From: CyberMind-FR <gandalf@Gk2.net>
Date: Thu, 25 Dec 2025 14:37:41 +0100
Subject: [PATCH] fix: reorganize all modules under SecuBox menu hierarchy

  - Add missing 'monitoring' and 'services' categories to main SecuBox hub
  - Move system-hub, bandwidth-manager, traffic-shaper to SecuBox menus
  - Move auth-guardian, ksm-manager to SecuBox security category
  - All 15 modules now properly organized in 5 categories

  Categories:
  - Security & Access: 5 modules (auth-guardian, client-guardian, crowdsec, ksm-manager, netifyd)
  - Monitoring & Analytics: 2 modules (mediaflow, netdata)
  - Network Management: 5 modules (bandwidth-manager, cdn-cache, network-modes, traffic-shaper, wireguard)
  - System & Performance: 1 module (system-hub)
  - Services & Applications: 1 module (vhosts)
---
 .../luci/menu.d/luci-app-auth-guardian.json   | 14 ++++++-------
 .../menu.d/luci-app-bandwidth-manager.json    | 20 +++++++++----------
 .../luci/menu.d/luci-app-ksm-manager.json     | 18 ++++++++---------
 .../share/luci/menu.d/luci-app-secubox.json   | 12 ++++++++++-
 .../luci/menu.d/luci-app-system-hub.json      | 20 +++++++++----------
 .../luci/menu.d/luci-app-traffic-shaper.json  | 12 +++++------
 6 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/luci-app-auth-guardian/root/usr/share/luci/menu.d/luci-app-auth-guardian.json b/luci-app-auth-guardian/root/usr/share/luci/menu.d/luci-app-auth-guardian.json
index 50496030..d4049d53 100644
--- a/luci-app-auth-guardian/root/usr/share/luci/menu.d/luci-app-auth-guardian.json
+++ b/luci-app-auth-guardian/root/usr/share/luci/menu.d/luci-app-auth-guardian.json
@@ -1,35 +1,35 @@
 {
-    "admin/services/auth-guardian": {
+    "admin/secubox/security/auth-guardian": {
         "title": "Auth Guardian",
         "order": 70,
         "action": {"type": "firstchild"}
     },
-    "admin/services/auth-guardian/overview": {
+    "admin/secubox/security/auth-guardian/overview": {
         "title": "Overview",
         "order": 10,
         "action": {"type": "view", "path": "auth-guardian/overview"}
     },
-    "admin/services/auth-guardian/sessions": {
+    "admin/secubox/security/auth-guardian/sessions": {
         "title": "Sessions",
         "order": 20,
         "action": {"type": "view", "path": "auth-guardian/sessions"}
     },
-    "admin/services/auth-guardian/vouchers": {
+    "admin/secubox/security/auth-guardian/vouchers": {
         "title": "Vouchers",
         "order": 30,
         "action": {"type": "view", "path": "auth-guardian/vouchers"}
     },
-    "admin/services/auth-guardian/oauth": {
+    "admin/secubox/security/auth-guardian/oauth": {
         "title": "OAuth Providers",
         "order": 40,
         "action": {"type": "view", "path": "auth-guardian/oauth"}
     },
-    "admin/services/auth-guardian/splash": {
+    "admin/secubox/security/auth-guardian/splash": {
         "title": "Splash Page",
         "order": 50,
         "action": {"type": "view", "path": "auth-guardian/splash"}
     },
-    "admin/services/auth-guardian/bypass": {
+    "admin/secubox/security/auth-guardian/bypass": {
         "title": "Bypass Rules",
         "order": 60,
         "action": {"type": "view", "path": "auth-guardian/bypass"}
diff --git a/luci-app-bandwidth-manager/root/usr/share/luci/menu.d/luci-app-bandwidth-manager.json b/luci-app-bandwidth-manager/root/usr/share/luci/menu.d/luci-app-bandwidth-manager.json
index 2eec880d..1a1c1fb3 100644
--- a/luci-app-bandwidth-manager/root/usr/share/luci/menu.d/luci-app-bandwidth-manager.json
+++ b/luci-app-bandwidth-manager/root/usr/share/luci/menu.d/luci-app-bandwidth-manager.json
@@ -1,5 +1,5 @@
 {
-	"admin/network/bandwidth-manager": {
+	"admin/secubox/network/bandwidth-manager": {
 		"title": "Bandwidth Manager",
 		"order": 55,
 		"action": {
@@ -9,7 +9,7 @@
 			"acl": ["luci-app-bandwidth-manager"]
 		}
 	},
-	"admin/network/bandwidth-manager/overview": {
+	"admin/secubox/network/bandwidth-manager/overview": {
 		"title": "Overview",
 		"order": 1,
 		"action": {
@@ -17,7 +17,7 @@
 			"path": "bandwidth-manager/overview"
 		}
 	},
-	"admin/network/bandwidth-manager/rules": {
+	"admin/secubox/network/bandwidth-manager/rules": {
 		"title": "QoS Rules",
 		"order": 2,
 		"action": {
@@ -25,7 +25,7 @@
 			"path": "bandwidth-manager/rules"
 		}
 	},
-	"admin/network/bandwidth-manager/quotas": {
+	"admin/secubox/network/bandwidth-manager/quotas": {
 		"title": "Client Quotas",
 		"order": 3,
 		"action": {
@@ -33,7 +33,7 @@
 			"path": "bandwidth-manager/quotas"
 		}
 	},
-	"admin/network/bandwidth-manager/usage": {
+	"admin/secubox/network/bandwidth-manager/usage": {
 		"title": "Real-time Usage",
 		"order": 4,
 		"action": {
@@ -41,7 +41,7 @@
 			"path": "bandwidth-manager/usage"
 		}
 	},
-	"admin/network/bandwidth-manager/settings": {
+	"admin/secubox/network/bandwidth-manager/settings": {
 		"title": "Settings",
 		"order": 5,
 		"action": {
@@ -49,7 +49,7 @@
 			"path": "bandwidth-manager/settings"
 		}
 	},
-	"admin/network/bandwidth-manager/media": {
+	"admin/secubox/network/bandwidth-manager/media": {
 		"title": "Media Detection",
 		"order": 6,
 		"action": {
@@ -57,7 +57,7 @@
 			"path": "bandwidth-manager/media"
 		}
 	},
-	"admin/network/bandwidth-manager/classes": {
+	"admin/secubox/network/bandwidth-manager/classes": {
 		"title": "QoS Classes",
 		"order": 7,
 		"action": {
@@ -65,7 +65,7 @@
 			"path": "bandwidth-manager/classes"
 		}
 	},
-	"admin/network/bandwidth-manager/clients": {
+	"admin/secubox/network/bandwidth-manager/clients": {
 		"title": "Connected Clients",
 		"order": 8,
 		"action": {
@@ -73,7 +73,7 @@
 			"path": "bandwidth-manager/clients"
 		}
 	},
-	"admin/network/bandwidth-manager/schedules": {
+	"admin/secubox/network/bandwidth-manager/schedules": {
 		"title": "Schedules",
 		"order": 9,
 		"action": {
diff --git a/luci-app-ksm-manager/root/usr/share/luci/menu.d/luci-app-ksm-manager.json b/luci-app-ksm-manager/root/usr/share/luci/menu.d/luci-app-ksm-manager.json
index 05525cb0..6a9af71d 100644
--- a/luci-app-ksm-manager/root/usr/share/luci/menu.d/luci-app-ksm-manager.json
+++ b/luci-app-ksm-manager/root/usr/share/luci/menu.d/luci-app-ksm-manager.json
@@ -1,5 +1,5 @@
 {
-	"admin/security/ksm-manager": {
+	"admin/secubox/security/ksm-manager": {
 		"title": "Key Storage Manager",
 		"order": 60,
 		"action": {
@@ -9,7 +9,7 @@
 			"acl": ["luci-app-ksm-manager"]
 		}
 	},
-	"admin/security/ksm-manager/overview": {
+	"admin/secubox/security/ksm-manager/overview": {
 		"title": "Overview",
 		"order": 1,
 		"action": {
@@ -17,7 +17,7 @@
 			"path": "ksm-manager/overview"
 		}
 	},
-	"admin/security/ksm-manager/keys": {
+	"admin/secubox/security/ksm-manager/keys": {
 		"title": "Keys",
 		"order": 2,
 		"action": {
@@ -25,7 +25,7 @@
 			"path": "ksm-manager/keys"
 		}
 	},
-	"admin/security/ksm-manager/hsm": {
+	"admin/secubox/security/ksm-manager/hsm": {
 		"title": "HSM Devices",
 		"order": 3,
 		"action": {
@@ -33,7 +33,7 @@
 			"path": "ksm-manager/hsm"
 		}
 	},
-	"admin/security/ksm-manager/certificates": {
+	"admin/secubox/security/ksm-manager/certificates": {
 		"title": "Certificates",
 		"order": 4,
 		"action": {
@@ -41,7 +41,7 @@
 			"path": "ksm-manager/certificates"
 		}
 	},
-	"admin/security/ksm-manager/secrets": {
+	"admin/secubox/security/ksm-manager/secrets": {
 		"title": "Secrets",
 		"order": 5,
 		"action": {
@@ -49,7 +49,7 @@
 			"path": "ksm-manager/secrets"
 		}
 	},
-	"admin/security/ksm-manager/ssh": {
+	"admin/secubox/security/ksm-manager/ssh": {
 		"title": "SSH Keys",
 		"order": 6,
 		"action": {
@@ -57,7 +57,7 @@
 			"path": "ksm-manager/ssh"
 		}
 	},
-	"admin/security/ksm-manager/audit": {
+	"admin/secubox/security/ksm-manager/audit": {
 		"title": "Audit Logs",
 		"order": 7,
 		"action": {
@@ -65,7 +65,7 @@
 			"path": "ksm-manager/audit"
 		}
 	},
-	"admin/security/ksm-manager/settings": {
+	"admin/secubox/security/ksm-manager/settings": {
 		"title": "Settings",
 		"order": 8,
 		"action": {
diff --git a/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json b/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json
index 09769518..6d5a7982 100644
--- a/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json
+++ b/luci-app-secubox/root/usr/share/luci/menu.d/luci-app-secubox.json
@@ -20,10 +20,15 @@
         "action": {"type": "view", "path": "secubox/settings"}
     },
     "admin/secubox/security": {
-        "title": "Security & Monitoring",
+        "title": "Security & Access",
         "order": 30,
         "action": {"type": "firstchild"}
     },
+    "admin/secubox/monitoring": {
+        "title": "Monitoring & Analytics",
+        "order": 35,
+        "action": {"type": "firstchild"}
+    },
     "admin/secubox/network": {
         "title": "Network Management",
         "order": 40,
@@ -33,5 +38,10 @@
         "title": "System & Performance",
         "order": 50,
         "action": {"type": "firstchild"}
+    },
+    "admin/secubox/services": {
+        "title": "Services & Applications",
+        "order": 60,
+        "action": {"type": "firstchild"}
     }
 }
diff --git a/luci-app-system-hub/root/usr/share/luci/menu.d/luci-app-system-hub.json b/luci-app-system-hub/root/usr/share/luci/menu.d/luci-app-system-hub.json
index f475a00a..79601380 100644
--- a/luci-app-system-hub/root/usr/share/luci/menu.d/luci-app-system-hub.json
+++ b/luci-app-system-hub/root/usr/share/luci/menu.d/luci-app-system-hub.json
@@ -1,5 +1,5 @@
 {
-	"admin/system/system-hub": {
+	"admin/secubox/system/system-hub": {
 		"title": "System Hub",
 		"order": 10,
 		"action": {
@@ -9,7 +9,7 @@
 			"acl": ["luci-app-system-hub"]
 		}
 	},
-	"admin/system/system-hub/overview": {
+	"admin/secubox/system/system-hub/overview": {
 		"title": "Overview",
 		"order": 1,
 		"action": {
@@ -17,7 +17,7 @@
 			"path": "system-hub/overview"
 		}
 	},
-	"admin/system/system-hub/services": {
+	"admin/secubox/system/system-hub/services": {
 		"title": "Services",
 		"order": 2,
 		"action": {
@@ -25,7 +25,7 @@
 			"path": "system-hub/services"
 		}
 	},
-	"admin/system/system-hub/logs": {
+	"admin/secubox/system/system-hub/logs": {
 		"title": "System Logs",
 		"order": 3,
 		"action": {
@@ -33,7 +33,7 @@
 			"path": "system-hub/logs"
 		}
 	},
-	"admin/system/system-hub/backup": {
+	"admin/secubox/system/system-hub/backup": {
 		"title": "Backup & Restore",
 		"order": 4,
 		"action": {
@@ -41,7 +41,7 @@
 			"path": "system-hub/backup"
 		}
 	},
-	"admin/system/system-hub/components": {
+	"admin/secubox/system/system-hub/components": {
 		"title": "Components",
 		"order": 5,
 		"action": {
@@ -49,7 +49,7 @@
 			"path": "system-hub/components"
 		}
 	},
-	"admin/system/system-hub/diagnostics": {
+	"admin/secubox/system/system-hub/diagnostics": {
 		"title": "Diagnostics",
 		"order": 6,
 		"action": {
@@ -57,7 +57,7 @@
 			"path": "system-hub/diagnostics"
 		}
 	},
-	"admin/system/system-hub/health": {
+	"admin/secubox/system/system-hub/health": {
 		"title": "System Health",
 		"order": 7,
 		"action": {
@@ -65,7 +65,7 @@
 			"path": "system-hub/health"
 		}
 	},
-	"admin/system/system-hub/remote": {
+	"admin/secubox/system/system-hub/remote": {
 		"title": "Remote Management",
 		"order": 8,
 		"action": {
@@ -73,7 +73,7 @@
 			"path": "system-hub/remote"
 		}
 	},
-	"admin/system/system-hub/settings": {
+	"admin/secubox/system/system-hub/settings": {
 		"title": "Settings",
 		"order": 9,
 		"action": {
diff --git a/luci-app-traffic-shaper/root/usr/share/luci/menu.d/luci-app-traffic-shaper.json b/luci-app-traffic-shaper/root/usr/share/luci/menu.d/luci-app-traffic-shaper.json
index 416083bf..82a00fe7 100644
--- a/luci-app-traffic-shaper/root/usr/share/luci/menu.d/luci-app-traffic-shaper.json
+++ b/luci-app-traffic-shaper/root/usr/share/luci/menu.d/luci-app-traffic-shaper.json
@@ -1,5 +1,5 @@
 {
-	"admin/network/traffic-shaper": {
+	"admin/secubox/network/traffic-shaper": {
 		"title": "Traffic Shaper",
 		"order": 65,
 		"action": {
@@ -11,7 +11,7 @@
 			"uci": ["traffic-shaper"]
 		}
 	},
-	"admin/network/traffic-shaper/overview": {
+	"admin/secubox/network/traffic-shaper/overview": {
 		"title": "Overview",
 		"order": 1,
 		"action": {
@@ -19,7 +19,7 @@
 			"path": "traffic-shaper/overview"
 		}
 	},
-	"admin/network/traffic-shaper/classes": {
+	"admin/secubox/network/traffic-shaper/classes": {
 		"title": "Traffic Classes",
 		"order": 2,
 		"action": {
@@ -27,7 +27,7 @@
 			"path": "traffic-shaper/classes"
 		}
 	},
-	"admin/network/traffic-shaper/rules": {
+	"admin/secubox/network/traffic-shaper/rules": {
 		"title": "Classification Rules",
 		"order": 3,
 		"action": {
@@ -35,7 +35,7 @@
 			"path": "traffic-shaper/rules"
 		}
 	},
-	"admin/network/traffic-shaper/stats": {
+	"admin/secubox/network/traffic-shaper/stats": {
 		"title": "Statistics",
 		"order": 4,
 		"action": {
@@ -43,7 +43,7 @@
 			"path": "traffic-shaper/stats"
 		}
 	},
-	"admin/network/traffic-shaper/presets": {
+	"admin/secubox/network/traffic-shaper/presets": {
 		"title": "Presets",
 		"order": 5,
 		"action": {