Core Update 164: Ship required files for IDS multiple providers feature

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 e362f7ab734dcd7aecd08c5cf517540415fd5b79..7df1edeaa1ce41cd77d5f49ff56ca7ac997c0610 100644 (file)
--- a/config/rootfiles/core/164/filelists/files
+++ b/config/rootfiles/core/164/filelists/files
@@ -1,3 +1,10 @@
 etc/collectd.conf
 etc/rc.d/init.d/squid
+etc/suricata/suricata.yaml
+srv/web/ipfire/cgi-bin/ids.cgi
+usr/sbin/convert-ids-multiple-providers
+usr/sbin/convert-snort
+var/ipfire/backup/bin/backup.pl
+var/ipfire/backup/include
+var/ipfire/ids-functions.pl
 var/ipfire/urlfilter/autoupdate/autoupdate.urls

diff --git a/config/rootfiles/core/164/filelists/ids-ruleset-sources b/config/rootfiles/core/164/filelists/ids-ruleset-sources
new file mode 120000 (symlink)
index 0000000..a226ada
--- /dev/null
+++ b/config/rootfiles/core/164/filelists/ids-ruleset-sources
@@ -0,0 +1 @@
+../../../common/ids-ruleset-sources
\ No newline at end of file

diff --git a/config/rootfiles/core/164/filelists/oinkmaster b/config/rootfiles/core/164/filelists/oinkmaster
new file mode 120000 (symlink)
index 0000000..75029e6
--- /dev/null
+++ b/config/rootfiles/core/164/filelists/oinkmaster
@@ -0,0 +1 @@
+../../../common/oinkmaster
\ No newline at end of file

diff --git a/config/rootfiles/core/164/update.sh b/config/rootfiles/core/164/update.sh
index c7916c6d2d674e79c089ffc6a14ac5508da64002..c6ac77152d10291a1ad7319bcc69c561034c14b4 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/suricata stop
 
 # Extract files
 extract_files
@@ -67,8 +68,12 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Run convert script for IDS multiple providers
+/usr/sbin/convert-ids-multiple-providers
+
 # Start services
 /etc/init.d/squid restart
+/etc/init.d/suricata start
 
 # This update needs a reboot...
 touch /var/run/need_reboot