IDS: Redesign backend for enabled/disabled sids in rulefiles.

[people/stevee/ipfire-2.x.git] / config / oinkmaster / oinkmaster.conf

diff --git a/config/oinkmaster/oinkmaster.conf b/config/oinkmaster/oinkmaster.conf
index a04e32987a94e5683427afabcd90c04bf6ea840c..4d4ee40efdc9fee026401403db571f1d3eaaf8a8 100644 (file)
--- a/config/oinkmaster/oinkmaster.conf
+++ b/config/oinkmaster/oinkmaster.conf
@@ -182,11 +182,8 @@ update_files = \.rules$|\.config$|\.conf$|\.txt$|\.map$
 # files from included files. Example to load stuff from "/etc/foo.conf".
 # include /etc/foo.conf
 
-# Include file for enabled sids.
-include /var/ipfire/suricata/oinkmaster-enabled-sids.conf
-
-# Include file for disabled sids.
-include /var/ipfire/suricata/oinkmaster-disabled-sids.conf
+# Include file for provider specific includes.
+include /var/ipfire/suricata/oinkmaster-provider-includes.conf
 
 # Include file which defines the runmode of suricata.
 include /var/ipfire/suricata/oinkmaster-modify-sids.conf
@@ -222,7 +219,7 @@ skipfile deleted.rules
 # local thresholding/suppressing in some local file and still update 
 # and use the official one though, in case important stuff is added to 
 # it some day. We do update it by default, but it's your call.
-# skipfile threshold.conf
+skipfile threshold.conf
 
 # If you update from multiple URLs at the same time you may need to 
 # ignore the sid-msg.map (and generate it yourself if you need one) as