webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp-stevee-idsv4' into next

Browse Source
This commit is contained in:
Peter Müller
2022-05-05 16:07:41 +00:00
parent e47f7c8295 1a9e81ce7f
commit 4d4f5df0c8
17 changed files with 1128 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/backup/backup.pl
View File

@@ -175,6 +175,12 @@ restore_backup() {
convert-ids-multiple-providers
fi
# IDS backend converter.
if [ -e "/var/ipfire/suricata/oinkmaster.conf" ]; then
# Run the converter
convert-ids-backend-files
fi
# Convert DNS settings
convert-dns-settings

7
config/backup/include
View File

@@ -24,6 +24,7 @@ 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
@@ -48,9 +49,7 @@ var/ipfire/ppp
var/ipfire/proxy
var/ipfire/qos/*
var/ipfire/qos/bin/qos.sh
var/ipfire/suricata/*.conf
var/ipfire/suricata/*.yaml
var/ipfire/suricata/providers-settings
var/ipfire/suricata
var/ipfire/*/settings
var/ipfire/time/
var/ipfire/urlfilter
@@ -60,5 +59,3 @@ var/log/ip-acct/*
var/log/rrd/*
var/log/rrd/collectd
var/log/vnstat
var/tmp/idsrules-*.tar.gz
var/tmp/idsrules-*.rules