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 84f50f54ecb28f1d93b770301c2be1649513c301..692d81c96db507bd3c460f3c9886df9df6770971 100644 (file)
--- 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 6a24a02ab8194cbee7143f427a8f8c6f7680d9a7..be0a64d766a18af73ad0435e2c66af884ac35d7c 100644 (file)
--- 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