mirror of
https://github.com/netbirdio/plugins.git
synced 2026-05-22 18:44:07 -07:00
net/relayd: post-merge cleanups 1/2
This commit is contained in:
+3
-3
@@ -44,7 +44,7 @@ class ServiceController extends ApiMutableServiceControllerBase
|
||||
static protected $internalServiceEnabled = 'general.enabled';
|
||||
static protected $internalServiceTemplate = 'OPNsense/Relayd';
|
||||
static protected $internalServiceName = 'relayd';
|
||||
|
||||
|
||||
/**
|
||||
* test relayd configuration
|
||||
* @return array
|
||||
@@ -53,7 +53,7 @@ class ServiceController extends ApiMutableServiceControllerBase
|
||||
{
|
||||
if ($this->request->isPost()) {
|
||||
$this->sessionClose();
|
||||
|
||||
|
||||
$backend = new Backend();
|
||||
|
||||
$result['function'] = "configtest";
|
||||
@@ -68,7 +68,7 @@ class ServiceController extends ApiMutableServiceControllerBase
|
||||
return array('status' => 'failed');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* avoid restarting Relayd on reconfigure
|
||||
*/
|
||||
|
||||
+5
-5
@@ -69,7 +69,7 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
}
|
||||
return array("result" => "failed");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* set relayd properties
|
||||
* @param $nodeType
|
||||
@@ -82,11 +82,11 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
if (!$this->request->isPost() || !$this->request->hasPost("relayd") || $nodeType == null) {
|
||||
return array('result' => 'failed');
|
||||
}
|
||||
|
||||
|
||||
$this->validateNodeType($nodeType);
|
||||
|
||||
|
||||
$relaydInfo = $this->request->getPost("relayd");
|
||||
|
||||
|
||||
if ($nodeType == 'general') {
|
||||
$mdlRelayd = new Relayd();
|
||||
$node = $mdlRelayd->getNodeByReference($nodeType);
|
||||
@@ -99,7 +99,7 @@ class SettingsController extends ApiMutableModelControllerBase
|
||||
Config::getInstance()->save();
|
||||
return array("result" => "saved");
|
||||
}
|
||||
|
||||
|
||||
// perform plugin specific validations
|
||||
if ($nodeType == 'virtualserver') {
|
||||
if ($relaydInfo[$nodeType]['type'] == 'redirect') {
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
<patterns>
|
||||
<pattern>ui/relayd/*</pattern>
|
||||
<pattern>api/relayd/*</pattern>
|
||||
<pattern>diag_logs_relayd.php*</pattern>
|
||||
</patterns>
|
||||
</page-services-relayd>
|
||||
</acl>
|
||||
|
||||
Reference in New Issue
Block a user