Merge remote-tracking branch 'ms/next-dns-ng' into next

2026-04-28 03:33:25 +02:00 · 2020-01-13 21:42:49 +00:00
parent 23dc6e0b23 7be4822f3d
commit 61cc563558
45 changed files with 1688 additions and 1117 deletions
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -143,6 +143,9 @@ restore_backup() {
 		rm -rf "/var/ipfire/snort"
 	fi

+	# Convert DNS settings
+	convert-dns-settings
+
 	return 0
 }