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 7df1edeaa1ce41cd77d5f49ff56ca7ac997c0610..25fd2a68165a7e4bf5690616bb6b8eee68d7786d 100644 (file)
--- 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 c6ac77152d10291a1ad7319bcc69c561034c14b4..3f07ceb33335e99b6a854b95ec2bffe2820ffb42 100644 (file)
--- 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