suricata: Do not ship an example configuration file

Stop shipping a full example configuration file for suricata.

Fixes #11836.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index 960390456a56f190c13f1b8e20ac37a794c424d3..0a4d9c3a47a2f70f9fb47480d53816761ae4f172 100644 (file)
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -4,7 +4,6 @@ etc/suricata/rules/classification.config
 etc/suricata/rules/reference.config
 etc/suricata/rules/threshold.config
 etc/suricata/suricata.yaml
-etc/suricata/suricata-example.yaml
 usr/bin/suricata
 #usr/bin/suricatasc
 #usr/lib/python2.7/site-packages/suricatasc

diff --git a/lfs/suricata b/lfs/suricata
index a37fd2953ed6a0e838d9d1e47aa6c65b88d46069..ca234549eabc1c4c14c73f2f2581d5e32225f1a2 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -82,7 +82,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make install-conf
-       mv /etc/suricata/suricata.yaml /etc/suricata/suricata-example.yaml
+
+       # Remove default suricata config file.
+       rm -rvf /etc/suricata/suricata.yaml
+
+       # Install IPFire related config file.
        install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
        -mkdir -p /etc/suricata/rules
        mv /etc/suricata/*.config /etc/suricata/rules/