merge with dev and resolve conflicts

This commit is contained in:
m0duspwnens
2020-09-09 16:23:36 -04:00
35 changed files with 514 additions and 197 deletions
+3 -3
View File
@@ -2,8 +2,8 @@ suricata:
config:
vars:
address-groups:
HOME_NET: "[192.168.0.0/16]"
EXTERNAL_NET: "!$HOME_NET"
HOME_NET: "[192.168.0.0/16,10.0.0.0/8,172.16.0.0/12]"
EXTERNAL_NET: "any"
HTTP_SERVERS: "$HOME_NET"
SMTP_SERVERS: "$HOME_NET"
SQL_SERVERS: "$HOME_NET"
@@ -590,4 +590,4 @@ suricata:
# threshold-file: /etc/suricata/threshold.config
#include: include1.yaml
#include: include2.yaml