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=542b6954ef13ba0b194c88bc7d34b042ae8bb1e0;p=people%2Fstevee%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 56550b6fcb..b40cf70cff 100644
--- a/config/suricata/suricata.yaml
+++ b/config/suricata/suricata.yaml
@@ -69,10 +69,9 @@ rule-files:
     # Include enabled ruleset files from external file
     - !include: /var/ipfire/suricata/suricata-used-providers.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 f5b68da8f1..866b4c5a73 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -101,10 +101,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