From: Peter Müller <peter.mueller@ipfire.org>
Date: Thu, 5 May 2022 16:07:41 +0000 (+0000)
Subject: Merge branch 'temp-stevee-idsv4' into next
X-Git-Tag: v2.27-core170~195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d4f5df0c8b4e212cec1fd1206616308584df18e;p=ipfire-2.x.git

Merge branch 'temp-stevee-idsv4' into next
---

4d4f5df0c8b4e212cec1fd1206616308584df18e
diff --cc config/backup/include
index cc4dc27dd0,354998eea0..d310b84875
--- a/config/backup/include
+++ b/config/backup/include
@@@ -23,7 -23,7 +23,8 @@@ etc/unboun
  root/.bash_history
  root/.gitconfig
  root/.ssh
 +srv/web/ipfire/html/proxy.pac
+ var/cache/suricata
  var/ipfire/auth/users
  var/ipfire/backup/addons/backup
  var/ipfire/backup/exclude.user