From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 19 Nov 2021 17:44:56 +0000 (+0000)
Subject: suricata: Load *.config files from default location
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a3e97b8d38c550b99282b5b0c60c83efc9f0c50;p=people%2Fmfischer%2Fipfire-2.x.git

suricata: Load *.config files from default location

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

diff --git a/config/suricata/suricata.yaml b/config/suricata/suricata.yaml
index 84f50f54ec..692d81c96d 100644
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -52,10 +52,9 @@ rule-files:
     # Include default rules.
     include: /var/ipfire/suricata/suricata-default-rules.yaml
 
-classification-file: /var/lib/suricata/classification.config
-reference-config-file: /var/lib/suricata/reference.config
-threshold-file: /var/lib/suricata/threshold.config
-
+classification-file: /usr/share/suricata/classification.config
+reference-config-file: /usr/share/suricata/reference.config
+threshold-file: /usr/share/suricata/threshold.config
 
 ##
 ## Logging options.
diff --git a/lfs/suricata b/lfs/suricata
index 6a24a02ab8..be0a64d766 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -105,10 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Move config files for references, threshold and classification
 	# to the rules directory.
-	mv /etc/suricata/*.config /var/lib/suricata
-
-	# Set correct permissions for the files.
-	chmod 644 /var/lib/suricata/*.config
+	rm -rfv /etc/suricata/*.config
 
 	# Set correct ownership for /var/lib/suricata and the
 	# contained files