Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

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

diff --git a/lfs/suricata b/lfs/suricata
index d6b016838022527de62a532dfebb09647d1810c8..0c3593d37b52ddb68a536ed71b5452a07e432059 100644 (file)
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -82,9 +82,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && make install-conf
-       mv /etc/suricata/suricata.yaml /etc/suricata/suricata-example.yaml
+
+       # Remove default suricata config file.
+       rm -rvf /etc/suricata/suricata.yaml
+
+       # Install IPFire related config file.
        install -m 0644 $(DIR_SRC)/config/suricata/suricata.yaml /etc/suricata
-       -mkdir -p /etc/suricata/rules
+
+       # Create emtpy rules directory.
+       -mkdir -p /var/lib/suricata
+
+       # Move config files for references, threshold and classification
+       # to the rules directory.
+       mv /etc/suricata/*.config /var/lib/suricata
+
+       # Create logging directory.
        -mkdir -p /var/log/suricata
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)