From 98637a012a3ed56652a4fbde3a460ea3d1d8c3b4 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Mon, 10 Apr 2017 14:12:09 +0200 Subject: [PATCH 1/2] fix the last bugs; remove useless directive --- net/quagga/Makefile | 3 +-- .../OPNsense/Quagga/Api/ServiceController.php | 14 +++----------- .../Quagga/forms/dialogEditOSPFInterface.xml | 5 ----- .../mvc/app/models/OPNsense/Quagga/OSPF.xml | 6 ------ .../mvc/app/views/OPNsense/Quagga/ospf.volt | 1 - net/quagga/src/opnsense/scripts/quagga/setup.sh | 4 ++++ .../service/conf/actions.d/actions_quagga.conf | 6 +++--- 7 files changed, 11 insertions(+), 28 deletions(-) diff --git a/net/quagga/Makefile b/net/quagga/Makefile index bc6dd8e2b..93cf75e01 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,8 +1,7 @@ PLUGIN_NAME= quagga -PLUGIN_VERSION= 0.0.3 +PLUGIN_VERSION= 1.0.0 PLUGIN_COMMENT= Quagga Routing Suite PLUGIN_DEPENDS= quagga PLUGIN_MAINTAINER= franz.fabian.94@gmail.com -PLUGIN_DEVEL= yes .include "../../Mk/plugins.mk" diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php index 22a50b322..93271fd74 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/ServiceController.php @@ -119,7 +119,6 @@ class ServiceController extends ApiControllerBase public function reconfigureAction() { if ($this->request->isPost()) { - $force_restart = false; // close session for long running action $this->sessionClose(); @@ -128,22 +127,15 @@ class ServiceController extends ApiControllerBase $runStatus = $this->statusAction(); - // stop squid when disabled - if ($runStatus['status'] == "running" && - ($mdlGeneral->enabled->__toString() == 0)) { - $this->stopAction(); - } + // stop quagga if it is running or not + $this->stopAction(); // generate template $backend->configdRun('template reload OPNsense/Quagga'); // (res)start daemon if ($mdlGeneral->enabled->__toString() == 1) { - if ($runStatus['status'] == "running" && !$force_restart) { - $this->restartAction(); - } else { - $this->startAction(); - } + $this->startAction(); } return array("status" => "ok"); diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml index 379fd7af3..d2d878400 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditOSPFInterface.xml @@ -21,11 +21,6 @@ text - - interface.area - - text - interface.cost diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml index c66368c7d..1e7390f39 100644 --- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml +++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/OSPF.xml @@ -14,7 +14,6 @@ 0 Y - N Y @@ -90,11 +89,6 @@ N /^\S+$/ - - - N - /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3},)*(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/ - 0 diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt index 522fe76ae..67bc36130 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt @@ -119,7 +119,6 @@ $( document ).ready(function() { {{ lang._('Interface Name') }} {{ lang._('Network Type') }} {{ lang._('Authentication Type') }} - {{ lang._('Area') }} {{ lang._('ID') }} {{ lang._('Commands') }} diff --git a/net/quagga/src/opnsense/scripts/quagga/setup.sh b/net/quagga/src/opnsense/scripts/quagga/setup.sh index 31397d0ad..0c6d492f2 100755 --- a/net/quagga/src/opnsense/scripts/quagga/setup.sh +++ b/net/quagga/src/opnsense/scripts/quagga/setup.sh @@ -10,3 +10,7 @@ chmod 750 /var/run/quagga mkdir -p /usr/local/etc/quagga chown $user:$group /usr/local/etc/quagga chmod 750 /usr/local/etc/quagga + +# ensure that quagga can read the configuration files +chown -R $user:$group /usr/local/etc/quagga +chown -R $user:$group /var/run/quagga diff --git a/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf b/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf index 28a91fb78..52f882abd 100644 --- a/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf +++ b/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf @@ -5,19 +5,19 @@ type:script message:starting quagga [stop] -command:/usr/local/etc/rc.d/quagga; exit 0 +command:/usr/local/etc/rc.d/quagga stop; exit 0 parameters: type:script message:stopping quagga [restart] -command:/usr/local/etc/rc.d/quagga restart +command:/usr/local/opnsense/scripts/quagga/setup.sh;/usr/local/etc/rc.d/quagga restart parameters: type:script message:restarting quagga [reconfigure] -command:/usr/local/etc/rc.d/quagga reload +command:/usr/local/opnsense/scripts/quagga/setup.sh;/usr/local/etc/rc.d/quagga reload parameters: type:script message:reconfigure quagga From 50d55e97d1fce7674b857722e51428f923270685 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Mon, 10 Apr 2017 14:19:41 +0200 Subject: [PATCH 2/2] write OSPF uppercase; closes #63 as it will exist for now and closes #113 as it is fixed in this commit --- .../opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml index f7834afab..66b13f763 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/ospf.xml @@ -3,7 +3,7 @@ ospf.enabled checkbox - This will activate the ospf service if routing protocols are enabled in "General". + This will activate the OSPF service if routing protocols are enabled in "General". ospf.passiveinterfaces