This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 0eb5b5f9e1289df1421b9af380b0ef91127c6aa5 (commit) via 823ece817fb2c3c95954a658dd1ed6fa3e1a9028 (commit) from 321745c05935cb2d1bfb88b995533366e96e1cca (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 0eb5b5f9e1289df1421b9af380b0ef91127c6aa5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 18 12:46:34 2024 +0000
core188: Ship the suricata init script
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 823ece817fb2c3c95954a658dd1ed6fa3e1a9028 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 18 11:15:31 2024 +0200
suricata: Use correct red device when using QMI
When using QMI the dial-in option has to be set to "ppp" during setup.
In this case the initscript of suricata will create all related firewall rules for the ppp0 interface which is not correct when using QMI where the RED device is called red0.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/188/filelists/files | 1 + src/initscripts/system/suricata | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Difference in files: diff --git a/config/rootfiles/core/188/filelists/files b/config/rootfiles/core/188/filelists/files index e9b52cc4f..e66c4af02 100644 --- a/config/rootfiles/core/188/filelists/files +++ b/config/rootfiles/core/188/filelists/files @@ -2,6 +2,7 @@ etc/rc.d/init.d/connectd etc/rc.d/init.d/functions etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red +etc/rc.d/init.d/suricata lib/udev/network-hotplug-vlan srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/services.cgi diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 938ea66de..79f9478c3 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -86,7 +86,7 @@ function generate_fw_rules { # Check if the IDS is enabled for this network zone. if [ "${!enable_ids_zone}" == "on" ]; then # Check if the current processed zone is "red" and the configured type is PPPoE dialin. - if [ "$zone" == "red" ] && [ "$RED_TYPE" == "PPPOE" ]; then + if [ "$zone" == "red" ] && [ "$RED_TYPE" == "PPPOE" ] && [ "$RED_DRIVER" != "qmi_wwan" ]; then # Set device name to ppp0. network_device="ppp0" elif [ "$zone" == "ovpn" ]; then
hooks/post-receive -- IPFire 2.x development tree