From: Peter Müller <peter.mueller@ipfire.org>
Date: Fri, 14 Jan 2022 14:21:22 +0000 (+0000)
Subject: Core Update 164: Ship firewall-related changes
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=215c32eb6435689fd798abdcfaff5ece3033aa02;p=people%2Fmfischer%2Fipfire-2.x.git

Core Update 164: Ship firewall-related changes

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/core/164/filelists/files b/config/rootfiles/core/164/filelists/files
index 7df1edeaa1..25fd2a6816 100644
--- a/config/rootfiles/core/164/filelists/files
+++ b/config/rootfiles/core/164/filelists/files
@@ -1,10 +1,13 @@
 etc/collectd.conf
+etc/rc.d/init.d/firewall
 etc/rc.d/init.d/squid
 etc/suricata/suricata.yaml
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/optionsfw.cgi
 usr/sbin/convert-ids-multiple-providers
 usr/sbin/convert-snort
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/include
+var/ipfire/graphs.pl
 var/ipfire/ids-functions.pl
 var/ipfire/urlfilter/autoupdate/autoupdate.urls
diff --git a/config/rootfiles/core/164/update.sh b/config/rootfiles/core/164/update.sh
index c6ac77152d..3f07ceb333 100644
--- a/config/rootfiles/core/164/update.sh
+++ b/config/rootfiles/core/164/update.sh
@@ -54,6 +54,7 @@ fi
 # Remove files
 
 # Stop services
+/etc/init.d/collectd stop
 /etc/init.d/suricata stop
 
 # Extract files
@@ -71,7 +72,13 @@ ldconfig
 # Run convert script for IDS multiple providers
 /usr/sbin/convert-ids-multiple-providers
 
+# Add missing configuration settings to optionsfw configuration
+echo "DROPHOSTILE=off" > /var/ipfire/optionsfw/settings
+echo "DROPSPOOFEDMARTIAN=on" > /var/ipfire/optionsfw/settings
+
 # Start services
+/etc/init.d/firewall restart
+/etc/init.d/collectd start
 /etc/init.d/squid restart
 /etc/init.d/suricata start