Merge branch 'master-IDSv3' into temp-c164-development

This commit is contained in:
Peter Müller
2022-01-14 14:05:10 +00:00
15 changed files with 2855 additions and 769 deletions

View File

@@ -159,6 +159,12 @@ restore_backup() {
rm -rf "/var/ipfire/snort"
fi
# IDS multiple providers converter.
if [ -e "/var/ipfire/suricata/rules-settings" ]; then
# Run the converter
convert-ids-multiple-providers
fi
# Convert DNS settings
convert-dns-settings

View File

@@ -49,7 +49,7 @@
/var/ipfire/qos/bin/qos.sh
/var/ipfire/suricata/*.conf
/var/ipfire/suricata/*.yaml
/var/ipfire/suricata/rules-settings
/var/ipfire/suricata/providers-settings
/var/ipfire/*/settings
/var/ipfire/time/
/var/ipfire/urlfilter
@@ -59,4 +59,5 @@
/var/log/rrd/*
/var/log/rrd/collectd
/var/log/vnstat
/var/tmp/idsrules.tar.gz
/var/tmp/idsrules-*.tar.gz
/var/tmp/idsrules-*.rules