Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2024-03-27 18:27:30 +01:00
13 changed files with 49 additions and 27 deletions

View File

@@ -117,13 +117,17 @@ 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
if ! grep -q "^LOGDROPHOSTILEIN=" /var/ipfire/optionsfw/settings; then
echo "LOGDROPHOSTILEIN=on" >> /var/ipfire/optionsfw/settings
fi
if ! grep -q "^LOGDROPHOSTILEOUT=" /var/ipfire/optionsfw/settings; then
echo "LOGDROPHOSTILEOUT=on" >> /var/ipfire/optionsfw/settings
fi
# Reload all firewall rules
/usr/local/bin/firewallctrl
# Rebuild initial ramdisks
dracut --regenerate-all --force
KVER="xxxKVERxxx"