Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Suricata interface delete icon fix. Issue #11136 #1000

Merged
merged 1 commit into from
Dec 7, 2020
Merged

Suricata interface delete icon fix. Issue #11136 #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion security/pfSense-pkg-suricata/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= pfSense-pkg-suricata
PORTVERSION= 6.0.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
4 changes: 2 additions & 2 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_interfaces.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@
// Delete the interface sub-directories and then the instance itself
$if_friendly = convert_friendly_interface_to_friendly_descr($snortcfg['interface']);
syslog(LOG_NOTICE, "Stopping Suricata on {$if_friendly}({$if_real}) due to Suricata instance deletion...");
suricata_stop($a_nat[$rulei], $if_real);
suricata_stop($a_nat[$delbtn_list], $if_real);
rmdir_recursive("{$suricatalogdir}suricata_{$if_real}{$suricata_uuid}");
rmdir_recursive("{$suricatadir}suricata_{$suricata_uuid}_{$if_real}");
syslog(LOG_NOTICE, "Deleted Suricata instance on {$if_friendly}({$if_real}) per user request...");
}

// Finally, delete the interface's config entry entirely
unset($a_nat[$rulei]);
unset($a_nat[$delbtn_list]);

// Save updated configuration
write_config("Suricata pkg: deleted one or more Suricata interfaces.");
Expand Down
1 change: 1 addition & 0 deletions security/pfSense-pkg-suricata4/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME= pfSense-pkg-suricata4
PORTVERSION= 4.1.9
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
4 changes: 2 additions & 2 deletions security/pfSense-pkg-suricata4/files/usr/local/www/suricata/suricata_interfaces.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@
// Delete the interface sub-directories and then the instance itself
$if_friendly = convert_friendly_interface_to_friendly_descr($snortcfg['interface']);
syslog(LOG_NOTICE, "Stopping Suricata on {$if_friendly}({$if_real}) due to Suricata instance deletion...");
suricata_stop($a_nat[$rulei], $if_real);
suricata_stop($a_nat[$delbtn_list], $if_real);
rmdir_recursive("{$suricatalogdir}suricata_{$if_real}{$suricata_uuid}");
rmdir_recursive("{$suricatadir}suricata_{$suricata_uuid}_{$if_real}");
syslog(LOG_NOTICE, "Deleted Suricata instance on {$if_friendly}({$if_real}) per user request...");
}

// Finally delete the interface's config entry entirely
unset($a_nat[$rulei]);
unset($a_nat[$delbtn_list]);

// Save updated configuration
write_config("Suricata pkg: deleted one or more Suricata interfaces.");
Expand Down