lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 16:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall: remove last "pfplugin" use #6390

Browse Source
This commit is contained in:
Franco Fichtner 2024-01-11 10:19:48 +01:00
parent 2cfe2fdc1c
commit 57312292ee
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plist
View File

@ -1122,7 +1122,6 @@
/usr/local/opnsense/service/conf/actions.d/actions_netflow.conf
/usr/local/opnsense/service/conf/actions.d/actions_openssh.conf
/usr/local/opnsense/service/conf/actions.d/actions_openvpn.conf
/usr/local/opnsense/service/conf/actions.d/actions_pfplugin.conf
/usr/local/opnsense/service/conf/actions.d/actions_syslog.conf
/usr/local/opnsense/service/conf/actions.d/actions_system.conf
/usr/local/opnsense/service/conf/actions.d/actions_template.conf

4
src/opnsense/mvc/app/controllers/OPNsense/Firewall/Api/FilterBaseController.php
View File

@ -124,7 +124,7 @@ abstract class FilterBaseController extends ApiMutableModelControllerBase
if ($this->request->isPost()) {
if ($rollback_revision != null) {
// background rollback timer
(new Backend())->configdpRun('pfplugin rollback_timer', [$rollback_revision], true);
(new Backend())->configdpRun('filter rollback_timer', [$rollback_revision], true);
}
return array("status" => (new Backend())->configdRun('filter reload'));
} else {
@ -136,7 +136,7 @@ abstract class FilterBaseController extends ApiMutableModelControllerBase
{
if ($this->request->isPost()) {
return array(
"status" => (new Backend())->configdpRun('pfplugin cancel_rollback', [$rollback_revision])
"status" => (new Backend())->configdpRun('filter cancel_rollback', [$rollback_revision])
);
} else {
return array("status" => "error");

12
src/opnsense/service/conf/actions.d/actions_filter.conf
View File

@ -142,3 +142,15 @@ command:/usr/local/opnsense/scripts/filter/find_table_references.py
parameters: %s
type:script_output
message:check which aliases match the given IP
[rollback_timer]
command:/usr/local/bin/flock -n -E 0 -o /tmp/filter_rollback_timer.lock /usr/local/opnsense/scripts/filter/rollback_timer.php
parameters: %s
type:script
message:wait for api feedback or revert to previous filter plugin config
[cancel_rollback]
command:/usr/local/opnsense/scripts/filter/rollback_cancel.php
parameters: %s
type:script_output
message:cancel filter rollback

11
src/opnsense/service/conf/actions.d/actions_pfplugin.conf
View File

@ -1,11 +0,0 @@
[rollback_timer]
command:/usr/local/bin/flock -n -E 0 -o /tmp/filter_rollback_timer.lock /usr/local/opnsense/scripts/filter/rollback_timer.php
parameters: %s
type:script
message:wait for api feedback or revert to previous filter plugin config
[cancel_rollback]
command:/usr/local/opnsense/scripts/filter/rollback_cancel.php
parameters: %s
type:script_output
message:cancel filter rollback