Merge branch 'temp-stevee-idsv4' into next

[people/pmueller/ipfire-2.x.git] / lfs / suricata

diff --git a/lfs/suricata b/lfs/suricata
index 4a9dcdb1d800a8a86daab53ea3c7847b68f67e23..fa7791cbefc32901a2e2f23a13b388660fd33340 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -98,15 +98,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Install IPFire related config file.
        install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
 
-       # Install yaml file for loading default rules.
-       install -m 0664 $(DIR_SRC)/config/suricata/suricata-default-rules.yaml /var/ipfire/suricata
-
-       # Set correct ownership for the default rules file.
-       chown nobody:nobody /var/ipfire/suricata/suricata-default-rules.yaml
-
        # Create emtpy rules directory.
        -mkdir -p /var/lib/suricata
 
+       # Create empty cache directory.
+       -mkdir -p /var/cache/suricata
+
        # Move config files for references, threshold and classification
        # to the rules directory.
        rm -rfv /etc/suricata/*.config
@@ -115,10 +112,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # (File has to be writeable for the nobody user)
        chown nobody:nobody /usr/share/suricata/classification.config
 
+       # Create empty threshold config file.
+       touch /usr/share/suricata/threshold.config
+
+       # Set correct ownership for the threshold.config file.
+       chown nobody:nobody /usr/share/suricata/threshold.config
+
        # Set correct ownership for /var/lib/suricata and the
        # contained files
        chown -R nobody:nobody /var/lib/suricata
 
+       # Set correct ownership for the cache directory.
+       chown nobody:nobody /var/cache/suricata
+
        # Create logging directory.
        -mkdir -p /var/log/suricata