[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 08b7500b267a54aa634fb34b67b4dfc0934ae2be

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 08b7500b267a54aa634fb34b67b4dfc0934ae2be

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2577 bytes --]

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, master has been updated
       via  08b7500b267a54aa634fb34b67b4dfc0934ae2be (commit)
      from  ad0d064a487c8912cbe4bd77ae652a4212e0fae9 (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 08b7500b267a54aa634fb34b67b4dfc0934ae2be
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Wed Mar 20 15:43:27 2024 +0100

    CU185-update.sh: Add drop hostile in & out logging entries if not already present
    
    - This patch ensures that those people who updated to CU184 before the CU184-update.sh
       patch fix to add the logging entries was added will get their optionsfw settings file
       correctly updated with CU185
    - This only adds the LOGDROPHOSTILEIN & LOGDROPHOSTILEOUT entries if they do noit already
       exist in the optionsfw settings file.
    
    Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/185/update.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index 2c95c4102..ec4d8ab82 100644
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -115,6 +115,15 @@ mv /var/ipfire/ovpn/ovpnconfig.new /var/ipfire/ovpn/ovpnconfig
 # Set correct ownership
 chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
 
+# Check if the drop hostile in and out logging options need to be added
+# into the optionsfw settings file and apply to firewall
+if ! [ $(grep "LOGDROPHOSTILEIN=on" /var/ipfire/optionsfw/settings) ] && \
+   ! [ $(grep "LOGDROPHOSTILEOUT=on" /var/ipfire/optionsfw/settings) ]; then
+        sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings
+        sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings
+        /usr/local/bin/firewallctrl
+fi
+
 # Rebuild initial ramdisks
 dracut --regenerate-all --force
 KVER="xxxKVERxxx"


hooks/post-receive
--
IPFire 2.x development tree