From 0894c205b74379ca7a17bb118d033deee8a9f461 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 15 Jul 2025 12:39:20 +0200 Subject: [PATCH] net/netbird: use "OPNsense.Netbird" where possible Not changing the config.xml mountpoint. --- net/netbird/Makefile | 6 +++--- net/netbird/src/etc/inc/plugins.inc.d/netbird.inc | 2 +- net/netbird/src/etc/rc.syshook.d/carp/30-netbird | 10 +++------- .../{netbird => Netbird}/Api/InitialController.php | 6 +++--- .../{netbird => Netbird}/Api/ServiceController.php | 14 +++++++------- .../Api/SettingsController.php | 8 ++++---- .../{netbird => Netbird}/ConstatusController.php | 6 +++--- .../{netbird => Netbird}/IndexController.php | 10 +++++----- .../{netbird => Netbird}/forms/general.xml | 0 .../{netbird => Netbird}/forms/initialup.xml | 0 .../OPNsense/{netbird => Netbird}/ACL/ACL.xml | 0 .../OPNsense/{netbird => Netbird}/Initial.php | 2 +- .../OPNsense/{netbird => Netbird}/Initial.xml | 0 .../OPNsense/{netbird => Netbird}/Menu/Menu.xml | 0 .../OPNsense/{netbird => Netbird}/Netbird.php | 2 +- .../OPNsense/{netbird => Netbird}/Netbird.xml | 0 .../OPNsense/{netbird => Netbird}/constatus.volt | 0 .../views/OPNsense/{netbird => Netbird}/index.volt | 0 .../OPNsense/{netbird => Netbird}/initialup.sh | 0 .../service/conf/actions.d/actions_netbird.conf | 2 +- .../OPNsense/{netbird => Netbird}/+TARGETS | 0 .../OPNsense/{netbird => Netbird}/netbird | 0 22 files changed, 32 insertions(+), 36 deletions(-) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/Api/InitialController.php (92%) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/Api/ServiceController.php (97%) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/Api/SettingsController.php (91%) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/ConstatusController.php (93%) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/IndexController.php (87%) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/forms/general.xml (100%) rename net/netbird/src/opnsense/mvc/app/controllers/OPNsense/{netbird => Netbird}/forms/initialup.xml (100%) rename net/netbird/src/opnsense/mvc/app/models/OPNsense/{netbird => Netbird}/ACL/ACL.xml (100%) rename net/netbird/src/opnsense/mvc/app/models/OPNsense/{netbird => Netbird}/Initial.php (98%) rename net/netbird/src/opnsense/mvc/app/models/OPNsense/{netbird => Netbird}/Initial.xml (100%) rename net/netbird/src/opnsense/mvc/app/models/OPNsense/{netbird => Netbird}/Menu/Menu.xml (100%) rename net/netbird/src/opnsense/mvc/app/models/OPNsense/{netbird => Netbird}/Netbird.php (98%) rename net/netbird/src/opnsense/mvc/app/models/OPNsense/{netbird => Netbird}/Netbird.xml (100%) rename net/netbird/src/opnsense/mvc/app/views/OPNsense/{netbird => Netbird}/constatus.volt (100%) rename net/netbird/src/opnsense/mvc/app/views/OPNsense/{netbird => Netbird}/index.volt (100%) rename net/netbird/src/opnsense/scripts/OPNsense/{netbird => Netbird}/initialup.sh (100%) rename net/netbird/src/opnsense/service/templates/OPNsense/{netbird => Netbird}/+TARGETS (100%) rename net/netbird/src/opnsense/service/templates/OPNsense/{netbird => Netbird}/netbird (100%) diff --git a/net/netbird/Makefile b/net/netbird/Makefile index 9765a5926..a2450c455 100644 --- a/net/netbird/Makefile +++ b/net/netbird/Makefile @@ -1,9 +1,9 @@ PLUGIN_NAME= netbird PLUGIN_VERSION= 0.1 -PLUGIN_DEPENDS= netbird +PLUGIN_DEPENDS= netbird PLUGIN_COMMENT= Peer-to-peer VPN that seamlessly connects your devices PLUGIN_MAINTAINER= opn-netbird@sun-ri.se -PLUGIN_WWW= https://netbird.io -PLUGIN_DEVEL= yes +PLUGIN_WWW= https://netbird.io +PLUGIN_DEVEL= yes .include "../../Mk/plugins.mk" diff --git a/net/netbird/src/etc/inc/plugins.inc.d/netbird.inc b/net/netbird/src/etc/inc/plugins.inc.d/netbird.inc index 596fa5029..57872cefe 100644 --- a/net/netbird/src/etc/inc/plugins.inc.d/netbird.inc +++ b/net/netbird/src/etc/inc/plugins.inc.d/netbird.inc @@ -30,7 +30,7 @@ function netbird_enabled() { - return !(new \OPNsense\netbird\Netbird())->general->Enabled->isEmpty(); + return !(new \OPNsense\Netbird\Netbird())->general->Enabled->isEmpty(); } function netbird_services() diff --git a/net/netbird/src/etc/rc.syshook.d/carp/30-netbird b/net/netbird/src/etc/rc.syshook.d/carp/30-netbird index 875593e14..b4638afb7 100755 --- a/net/netbird/src/etc/rc.syshook.d/carp/30-netbird +++ b/net/netbird/src/etc/rc.syshook.d/carp/30-netbird @@ -33,17 +33,13 @@ require_once('util.inc'); require_once('interfaces.inc'); -$model = new \OPNsense\netbird\Netbird(); -$enabled = $model->general->Enabled->__toString(); +$model = new \OPNsense\Netbird\Netbird(); - -if(!$enabled) { +if ($model->general->Enabled->isEmpty()) { exit(0); } -$carpif = $model->general->CarpIf->__toString(); - -if($carpif == '') { +if (!$model->general->CarpIf->isEqual('')) { exit(0); } diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/InitialController.php b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php similarity index 92% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/InitialController.php rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php index 03ea2b79b..a86b619d9 100644 --- a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/InitialController.php +++ b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/InitialController.php @@ -28,16 +28,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird\Api; +namespace OPNsense\Netbird\Api; use OPNsense\Base\ApiMutableModelControllerBase; /** * netbird settings controller - * @package OPNsense\netbird + * @package OPNsense\Netbird */ class InitialController extends ApiMutableModelControllerBase { protected static $internalModelName = 'netbird'; - protected static $internalModelClass = 'OPNsense\netbird\Initial'; + protected static $internalModelClass = 'OPNsense\Netbird\Initial'; } diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/ServiceController.php b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php similarity index 97% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/ServiceController.php rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php index 4e58085e3..466c56c68 100644 --- a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/ServiceController.php +++ b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/ServiceController.php @@ -28,24 +28,24 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird\Api; +namespace OPNsense\Netbird\Api; use OPNsense\Base\ApiMutableServiceControllerBase; use OPNsense\Core\Backend; use OPNsense\Core\Config; -use OPNsense\netbird\Initial; -use OPNsense\netbird\Netbird; +use OPNsense\Netbird\Initial; +use OPNsense\Netbird\Netbird; /** * Class ServiceController - * @package OPNsense\netbird + * @package OPNsense\Netbird */ class ServiceController extends ApiMutableServiceControllerBase { const NETBIRD_CONFIG_JSON = '/usr/local/etc/netbird/config.json'; - protected static $internalServiceClass = '\OPNsense\netbird\Netbird'; + protected static $internalServiceClass = '\OPNsense\Netbird\Netbird'; protected static $internalServiceEnabled = 'general.Enabled'; - protected static $internalServiceTemplate = 'OPNsense/netbird'; + protected static $internalServiceTemplate = 'OPNsense/Netbird'; protected static $internalServiceName = 'netbird'; public function conStatusAction(): string @@ -206,7 +206,7 @@ class ServiceController extends ApiMutableServiceControllerBase try { $mdlNetbird = new Netbird(); $backend = new Backend(); - if (trim($backend->configdRun('template reload OPNsense/netbird')) == "OK") { + if (trim($backend->configdRun('template reload OPNsense/Netbird')) == "OK") { $status = "ok"; } diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/SettingsController.php b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php similarity index 91% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/SettingsController.php rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php index 8f880f942..bd7ebc603 100644 --- a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/Api/SettingsController.php +++ b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/Api/SettingsController.php @@ -28,16 +28,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird\Api; +namespace OPNsense\Netbird\Api; use OPNsense\Base\ApiMutableModelControllerBase; /** - * netbird settings controller - * @package OPNsense\netbird + * Netbird settings controller + * @package OPNsense\Netbird */ class SettingsController extends ApiMutableModelControllerBase { protected static $internalModelName = 'netbird'; - protected static $internalModelClass = 'OPNsense\netbird\Netbird'; + protected static $internalModelClass = 'OPNsense\Netbird\Netbird'; } diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/ConstatusController.php b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php similarity index 93% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/ConstatusController.php rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php index a288e391e..6c041912d 100644 --- a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/ConstatusController.php +++ b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/ConstatusController.php @@ -28,16 +28,16 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird; +namespace OPNsense\Netbird; /** * Class ConstatusController - * @package OPNsense\netbird + * @package OPNsense\Netbird */ class ConstatusController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->pick('OPNsense/netbird/constatus'); + $this->view->pick('OPNsense/Netbird/constatus'); } } diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/IndexController.php b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php similarity index 87% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/IndexController.php rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php index f17874e21..3567b469d 100644 --- a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/IndexController.php +++ b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/IndexController.php @@ -28,18 +28,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird; +namespace OPNsense\Netbird; /** * Class IndexController - * @package OPNsense\netbird + * @package OPNsense\Netbird */ class IndexController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->generalForm = $this->getForm("general"); - $this->view->initialUpForm = $this->getForm("initialup"); - $this->view->pick('OPNsense/netbird/index'); + $this->view->generalForm = $this->getForm('general'); + $this->view->initialUpForm = $this->getForm('initialup'); + $this->view->pick('OPNsense/Netbird/index'); } } diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/forms/general.xml b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/general.xml similarity index 100% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/forms/general.xml rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/general.xml diff --git a/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/forms/initialup.xml b/net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/initialup.xml similarity index 100% rename from net/netbird/src/opnsense/mvc/app/controllers/OPNsense/netbird/forms/initialup.xml rename to net/netbird/src/opnsense/mvc/app/controllers/OPNsense/Netbird/forms/initialup.xml diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/ACL/ACL.xml b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/ACL/ACL.xml similarity index 100% rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/ACL/ACL.xml rename to net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/ACL/ACL.xml diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Initial.php b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php similarity index 98% rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Initial.php rename to net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php index e629015fe..01176577c 100644 --- a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Initial.php +++ b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.php @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird; +namespace OPNsense\Netbird; use OPNsense\Base\BaseModel; diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Initial.xml b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.xml similarity index 100% rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Initial.xml rename to net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Initial.xml diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Menu/Menu.xml b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Menu/Menu.xml similarity index 100% rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Menu/Menu.xml rename to net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Menu/Menu.xml diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Netbird.php b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php similarity index 98% rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Netbird.php rename to net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php index 76dbf4784..d562455d1 100644 --- a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Netbird.php +++ b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.php @@ -28,7 +28,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -namespace OPNsense\netbird; +namespace OPNsense\Netbird; use OPNsense\Base\BaseModel; diff --git a/net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Netbird.xml b/net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.xml similarity index 100% rename from net/netbird/src/opnsense/mvc/app/models/OPNsense/netbird/Netbird.xml rename to net/netbird/src/opnsense/mvc/app/models/OPNsense/Netbird/Netbird.xml diff --git a/net/netbird/src/opnsense/mvc/app/views/OPNsense/netbird/constatus.volt b/net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/constatus.volt similarity index 100% rename from net/netbird/src/opnsense/mvc/app/views/OPNsense/netbird/constatus.volt rename to net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/constatus.volt diff --git a/net/netbird/src/opnsense/mvc/app/views/OPNsense/netbird/index.volt b/net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/index.volt similarity index 100% rename from net/netbird/src/opnsense/mvc/app/views/OPNsense/netbird/index.volt rename to net/netbird/src/opnsense/mvc/app/views/OPNsense/Netbird/index.volt diff --git a/net/netbird/src/opnsense/scripts/OPNsense/netbird/initialup.sh b/net/netbird/src/opnsense/scripts/OPNsense/Netbird/initialup.sh similarity index 100% rename from net/netbird/src/opnsense/scripts/OPNsense/netbird/initialup.sh rename to net/netbird/src/opnsense/scripts/OPNsense/Netbird/initialup.sh diff --git a/net/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf b/net/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf index a995f09f1..da49b4e3d 100644 --- a/net/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf +++ b/net/netbird/src/opnsense/service/conf/actions.d/actions_netbird.conf @@ -34,7 +34,7 @@ type:script message:set netbird up [set-up-initial] -command:/usr/local/opnsense/scripts/OPNsense/netbird/initialup.sh +command:/usr/local/opnsense/scripts/OPNsense/Netbird/initialup.sh parameters: -m %s -k %s -n %s type:script_output message:setup netbird diff --git a/net/netbird/src/opnsense/service/templates/OPNsense/netbird/+TARGETS b/net/netbird/src/opnsense/service/templates/OPNsense/Netbird/+TARGETS similarity index 100% rename from net/netbird/src/opnsense/service/templates/OPNsense/netbird/+TARGETS rename to net/netbird/src/opnsense/service/templates/OPNsense/Netbird/+TARGETS diff --git a/net/netbird/src/opnsense/service/templates/OPNsense/netbird/netbird b/net/netbird/src/opnsense/service/templates/OPNsense/Netbird/netbird similarity index 100% rename from net/netbird/src/opnsense/service/templates/OPNsense/netbird/netbird rename to net/netbird/src/opnsense/service/templates/OPNsense/Netbird/netbird