diff --git a/Makefile b/Makefile index 991c41d..4ed3d20 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,7 @@ do-install: ${STAGEDIR}${DATADIR} @${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \ ${STAGEDIR}${PREFIX}/pkg/birdvector.xml \ - ${STAGEDIR}${DATADIR}/info.xml + ${STAGEDIR}${DATADIR}/info.xml \ + ${STAGEDIR}${PREFIX}/www/packages/birdvector/birdvector_about.php .include diff --git a/files/usr/local/pkg/birdvector.inc b/files/usr/local/pkg/birdvector.inc index 9459b4c..4579953 100644 --- a/files/usr/local/pkg/birdvector.inc +++ b/files/usr/local/pkg/birdvector.inc @@ -71,7 +71,10 @@ function birdvector_deinstall() { bird_kill(); - unset($config['installedpackages']['birdvector']['config'][0]); + if (isset($config['installedpackages']['birdvector']['config'])) { + unset($config['installedpackages']['birdvector']['config']); + } + write_config("[birdvector] Package uninstalled."); unlink_if_exists('/usr/local/etc/pathvector.yaml'); @@ -141,7 +144,7 @@ function get_bird_status() { } function pathvector_version() { - $output = shell_exec("/usr/local/bin/pathvector version | grep -w 'Built\|Pathvector' 2>&1"); + $output = shell_exec("/usr/local/bin/pathvector version | grep -w 'Pathvector' | awk '{print $2}'"); if (!$output) { return "Cannot Connect to Pathvector!"; } @@ -149,7 +152,7 @@ function pathvector_version() { } function bgpq4_version() { - $output = shell_exec("/usr/local/bin/bgpq4 -v | grep -w 'version' 2>&1"); + $output = shell_exec("/usr/local/bin/bgpq4 -v | grep -w 'version' | awk '{print $2}' 2>&1"); if (!$output) { return "Cannot Connect to BGPQ4!"; } @@ -157,11 +160,11 @@ function bgpq4_version() { } function bird_version() { - $output = shell_exec("/usr/local/sbin/birdc --version 2>&1"); + $output = shell_exec("/usr/local/sbin/bird --version 2>&1"); if (!$output) { return "Cannot Connect to BIRD!"; } - return $output; + return explode(' ', $output)[2];; } ?> diff --git a/files/usr/local/www/packages/birdvector/birdvector_about.php b/files/usr/local/www/packages/birdvector/birdvector_about.php index 0c85a2a..df28bfc 100644 --- a/files/usr/local/www/packages/birdvector/birdvector_about.php +++ b/files/usr/local/www/packages/birdvector/birdvector_about.php @@ -16,26 +16,82 @@ display_top_tabs($tab_array); ?> + +
-

Bird Vector

-
-

Bird Vector is a tool created to assist the routing abilities of pfSense, since pfSense officially only supports FRR (Free Range Routing) rather thanthe BIRD Routing Platform, with great strides and additions from Nate Sales from Pathvector and BGPQ4 by Job Snijders, Bringing the CLI Based operations of BIRD, Pathvector and BGPQ4 into the GUI of pfSense.

-
-
Pathvector Version:

Pathvector.io |-| Pathvector Github
-
-
-
BIRD Routing Daemon Version:

Network.CZ |-| BIRD Gitlab
-
-
-
BGPQ4 Version:

Job Snijders |-| BGPQ4 Github
-
-
-
Birdvector Version: 
1.0

ZappieHost.com |-| BirdVector Github
-
+

Bird Vector

+
+ +
+
+
+
+ +
+ +
+ +

+ Bird Vector is a tool created to assist the routing abilities of pfSense, since pfSense officially only supports FRR (Free Range Routing) rather thanthe BIRD Routing Platform, with great strides and additions from Nate Sales from Pathvector and BGPQ4 by Job Snijders, Bringing the CLI Based operations of BIRD, Pathvector and BGPQ4 into the GUI of pfSense. +

+ +
+
+ +
+ +
+ Version: %%PKGVERSION%% + + ZappieHost.com |-| BirdVector Github + +
+
+ +
+ +
+ Version: + + Pathvector.io |-| Pathvector Github + +
+
+ +
+ +
+ Version: + + Network.CZ |-| BIRD Gitlab + +
+
+ +
+ +
+ Version: + + Job Snijders |-| BGPQ4 Github + +
+
+
- +