Core Update 171: Ship and restart Suricata

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

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

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

diff --git a/config/rootfiles/core/171/update.sh b/config/rootfiles/core/171/update.sh
index 38aa57a65bce3902650579ac63baeafcaae7d08d..a8172a929852622172be4eb4dc224e31c51f3f85 100644 (file)
--- a/config/rootfiles/core/171/update.sh
+++ b/config/rootfiles/core/171/update.sh
@@ -50,6 +50,7 @@ done
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
 /etc/rc.d/init.d/ipsec stop
+/etc/init.d/rc.d/suricata stop
 /etc/rc.d/init.d/collectd stop
 
 KVER="xxxKVERxxx"
@@ -226,6 +227,9 @@ chown -v root:root /var/ipfire/backup/{in,ex}clude*
 
 # Start services
 /etc/rc.d/init.d/collectd start
+if grep -q "ENABLED=on" /var/ipfire/suricata/settings; then
+       /etc/rc.d/init.d/suricata start
+fi
 /etc/rc.d/init.d/unbound start
 /etc/rc.d/init.d/apache start
 if grep -q "ENABLED=on" /var/ipfire/ovpn/settings; then