From: Peter Müller <peter.mueller@ipfire.org>
Date: Fri, 14 Jan 2022 14:13:08 +0000 (+0000)
Subject: Core Update 164: Ship required files for IDS multiple providers feature
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7c9820474675638123fdd1b13f4211e135a2f07a;p=people%2Fstevee%2Fipfire-2.x.git

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 e362f7ab73..7df1edeaa1 100644
--- 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
index 0000000000..a226ada39b
--- /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
index 0000000000..75029e6799
--- /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 c7916c6d2d..c6ac77152d 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/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