core189: Ship suricata changes

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/core/189/filelists/files
index 2586805ea9569b0fe9f57254dbb4ba174014a25a..7afa1ac2e94f71f2de56ce574540b22698d5b6cc 100644 (file)
--- a/config/rootfiles/core/189/filelists/files
+++ b/config/rootfiles/core/189/filelists/files
@@ -1,4 +1,12 @@
+etc/collectd.conf
+etc/rc.d/init.d/firewall
 etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/functions.network
+etc/rc.d/init.d/suricata
+srv/web/ipfire/cgi-bin/getrrdimage.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/html/include/rrdimage.js
+usr/bin/suricata-watcher
+var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/ids-functions.pl

diff --git a/config/rootfiles/core/189/update.sh b/config/rootfiles/core/189/update.sh
index f2c8863d63974d3963d43474bbe650bd8c089181..43323f38ab965531341d440988d583451685f75c 100644 (file)
--- a/config/rootfiles/core/189/update.sh
+++ b/config/rootfiles/core/189/update.sh
@@ -349,6 +349,7 @@ ldconfig
 telinit u
 
 # Start services
+/etc/init.d/collectd restart
 /usr/local/bin/openvpnctrl -s
 /usr/local/bin/openvpnctrl -sn2n