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 56550b6fcbdb5032880e036d7c10f3a72086a247..b40cf70cff5fef8cca2ac99a1de52580dda3a015 100644 (file)
--- 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 f5b68da8f19471e82a77eb54a7f2a142586294b7..866b4c5a731b9246b780e8e5d449564274642db9 100644 (file)
--- 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