suricata: Support Zabbix requirements

- The Zabbix addon will use the unix socket and also the suricatasc tool.
- Update configure to enable unix-socket
- Update rootfile to uncomment suricatasc
- This v2 version also sets the unix socket to yes in suricata.yaml

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 2bfc3babda82253d7a98fe4b9220bfb74e1887ba..518920abd41343bf9c1e35fd9e34e944eef0b386 100644 (file)
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -3,7 +3,7 @@ etc/suricata/suricata.yaml
 usr/bin/suricata
 usr/bin/suricata-watcher
 #usr/bin/suricatactl
-#usr/bin/suricatasc
+usr/bin/suricatasc
 usr/sbin/convert-ids-backend-files
 #usr/share/doc/suricata
 #usr/share/doc/suricata/AUTHORS

diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index 31c8d38977818328a831f1925c711bd08d5bfbb8..dd3492eb6392c952aac06202913769ab47a78c54 100644 (file)
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -1140,7 +1140,7 @@ runmode: workers
 # activated in live capture mode. You can use the filename variable to set
 # the file name of the socket.
 unix-command:
-  enabled: auto
+  enabled: yes
   #filename: custom.socket
 
 # Magic file. The extension .mgc is added to the value here.

diff --git a/lfs/suricata b/lfs/suricata
index e84c604c6c80e90e86920ba9c4f6242e84316a67..95403be78bb425d6e24ed455feeb4373efe2beb0 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -83,7 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --with-libjansson-libraries=/usr/lib \
                --with-libjansson-includes=/usr/include \
                --disable-suricata-update \
-               --enable-rust
+               --enable-rust \
+               --enable-unix-socket
 
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install