Merge remote-tracking branch 'stevee/next-suricata' into next

config/backup/backup.pl

@@ -129,6 +129,15 @@ restore_backup() {
 	# Convert old OpenVPN CCD files (CN change, Core Update 75)
 	convert-ovpn
 
+	# Snort to suricata converter.
+	if [ -d "/var/ipfire/snort" ]; then
+		# Run converter
+		convert-snort
+
+		# Remove old configuration directory.
+		rm -rf "/var/ipfire/snort"
+	fi
+
 	return 0
 }
 

config/backup/include

@@ -46,10 +46,13 @@
 /var/ipfire/proxy
 /var/ipfire/qos/*
 /var/ipfire/qos/bin/qos.sh
+/var/ipfire/suricata/*.conf
+/var/ipfire/suricata/*.yaml
 /var/ipfire/*/settings
 /var/ipfire/time/
 /var/ipfire/urlfilter
 /var/ipfire/vpn
+/var/lib/suricata
 /var/log/ip-acct/*
 /var/log/rrd/*
 /var/log/rrd/collectd