From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 29 Aug 2018 10:27:12 +0000 (+0200)
Subject: suricata: Do not ship an example configuration file
X-Git-Tag: suricata-beta3~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2e6bf6e5f0a3867664c68cd85dff686a08b696c;p=people%2Fstevee%2Fipfire-2.x.git

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 960390456a..0a4d9c3a47 100644
--- 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 a37fd2953e..ca234549ea 100644
--- 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/