From f60a419e84148703fc4760cfb309a8ac3686434d Mon Sep 17 00:00:00 2001
From: Vincent Li <vincent.mc.li@gmail.com>
Date: Wed, 29 May 2024 18:18:31 +0000
Subject: [PATCH] BPFire menu re-arrange

Re-arrange the menu to have BPF centric
main menu, this also easy the developing
of loxilb load balancer GUI since loxilb
will have multiple functions like enable
loxilb, create loxilb lb, create loxilb ip
...etc, so each loxilb function has their
own CGI UI.

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
---
 config/menu/00-menu.main     |  2 +-
 config/menu/30-network.menu  |  6 ------
 config/menu/50-firewall.menu |  5 -----
 config/menu/60-ipfire.menu   | 13 ++++++++++++-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/menu/00-menu.main b/config/menu/00-menu.main
index a53fa5a5a..57d21eaba 100644
--- a/config/menu/00-menu.main
+++ b/config/menu/00-menu.main
@@ -22,7 +22,7 @@
 			   	'enabled' => 1,
 			   	'subMenu' => $subproxy
 			   	};
-    $menu->{'07.ipfire'} = {'caption' => 'IPFire',
+    $menu->{'07.ipfire'} = {'caption' => 'BPFire',
 				'enabled' => 1,
 				'subMenu' => $subipfire
 			 	};
diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index 7acd221ed..4ef537ed4 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -63,12 +63,6 @@
 				 'title' => "$Lang::tr{'static routes'}",
 				 'enabled' => 1,
 				 };
-    $subnetwork->{'63.loxilb'} = {
-				 'caption' => $Lang::tr{'loxilb'},
-				 'uri' => '/cgi-bin/loxilb.cgi',
-				 'title' => "$Lang::tr{'loxilb'}",
-				 'enabled' => 1,
-				 };
     $subnetwork->{'70.aliases'} = {
 				  'caption' => $Lang::tr{'aliases'},
 				  'uri' => '/cgi-bin/aliases.cgi',
diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 52bfc9bdf..cd2af7cbb 100644
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -44,8 +44,3 @@
 				'title' => "$Lang::tr{'ipts'}",
 				'enabled' => 1,
 				};
-	$subfirewall->{'100.ids'} = {'caption' => $Lang::tr{'ebpf xdp ddos'},
-				'uri' => '/cgi-bin/ddos.cgi',
-				'title' => "$Lang::tr{'ebpf xdp ddos system'}",
-				'enabled' => 1,
-				};
diff --git a/config/menu/60-ipfire.menu b/config/menu/60-ipfire.menu
index 8b4c13950..8c0c52e90 100644
--- a/config/menu/60-ipfire.menu
+++ b/config/menu/60-ipfire.menu
@@ -1,4 +1,15 @@
-    $subipfire->{'10.pakfire'} = {'caption' => 'Pakfire',
+    $subipfire->{'10.ddos'} = {'caption' => $Lang::tr{'ebpf xdp ddos'},
+                                'uri' => '/cgi-bin/ddos.cgi',
+                                'title' => "$Lang::tr{'ebpf xdp ddos system'}",
+                                'enabled' => 1,
+                                };
+    $subipfire->{'20.loxilb'} = {
+                                 'caption' => $Lang::tr{'loxilb'},
+                                 'uri' => '/cgi-bin/loxilb.cgi',
+                                 'title' => "$Lang::tr{'loxilb'}",
+                                 'enabled' => 1,
+                                 };
+    $subipfire->{'80.pakfire'} = {'caption' => 'Pakfire',
 				  'uri' => '/cgi-bin/pakfire.cgi',
 				  'title' => "Pakfire",
 				  'enabled' => 1,