webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
19,741 Commits 2 Branches 1 Tag
2bfcbac468277beeaebb2d7d976cdc9cedad2bc9
Commit Graph

48 Commits

Author SHA1 Message Date
Tim FitzGeorge
d8bb263819 backup: Add ipblocklist related files. 
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2022-07-07 17:26:14 +02:00
Peter Müller
4d4f5df0c8 Merge branch 'temp-stevee-idsv4' into next 2022-05-05 16:07:41 +00:00
Stefan Schantl
7bc15b982c backup: Add files for new IDS backend. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2022-04-16 15:54:44 +02:00
Peter Müller
73845df507 backup: Include proxy.pac 
Fixes: #12814

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2022-03-30 13:54:51 +00:00
Michael Tremer
c7e0d73e7c backup: Make include/exclude files relative 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2022-03-07 18:51:23 +00:00
Stefan Schantl
b35e27a28a backup: Adjust includes file to include new IDS files into backups. 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2021-12-19 13:23:43 +01:00
Stefan Schantl
92206da35a Backup: Add idsrules tarball. 
The tarball is required to generate and restore the IDS ruleset.

Fixes #12319.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-05 07:34:07 +00:00
Stefan Schantl
00a083aaf2 Backup: Add suricata rules-settings file. 
This file contains the configured ruleset and oinkcode settings and
therefore needs to be backuped and restored.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-04-05 07:33:45 +00:00
Michael Tremer
0bdb63924b backup: Fix saving DNS settings 
There was a typo in /var/ipfire/dns/servers and the settings
file was not explicitely included in the backup.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-03-04 11:30:31 +00:00
Arne Fitzenreiter
b5afe1e8d5 backup: add /var/ipfire/dns/server to include 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2020-03-02 22:25:41 +00:00
Stefan Schantl
c1a3401235 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata 2019-01-21 13:04:13 +01:00
Michael Tremer
5321fcbff3 Backup conntrackd's configuration file 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2019-01-06 09:01:38 +00:00
Stefan Schantl
a13ddf04d9 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata 
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-12-12 09:27:59 +01:00
Michael Tremer
ac1fc6ea5e backup: Include addon backups in main backup 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-10-31 12:10:18 +00:00
Michael Tremer
33d2002767 backup: Include custom include/exclude files 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-10-31 12:08:57 +00:00
Stefan Schantl
762a33f17c suricata: Add files to be backuped 
Now all oinkmaster related config files and suricata
related yaml files in "/var/ipfire/suricata/" will be
included into the backups.

Also the entire ruleset is part of the backup, so after a
backup has been restored, the IDS can be used in the same way
as before.

Fixes #11835.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
 2018-08-30 14:13:37 +02:00
Michael Tremer
f868ccb763 backup: Add root's SSH keys and settings 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-08-21 15:05:40 +01:00
Michael Tremer
9b0618c09f backup: Add custom squid configuration files 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-08-21 15:05:13 +01:00
Michael Tremer
7486e30eeb backup: Order incldue/exclude alphabetically 
Nothing has been added or removed

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-08-21 11:32:04 +01:00
Michael Tremer
3f42cf5cb9 backup: Don't backup apache configuration, keys only 
In the past the apache configuration was part of the backup
and may have been restored after Core Update 118 was installed
with PHP being dropped amongst other things.

This patch will make sure that only keys are being backuped.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2018-02-21 12:06:02 +00:00
Alexander Marx
a6c985284d Captive-Portal: add backup-part 
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
 2017-09-22 18:54:03 +01:00
Arne Fitzenreiter
11ecfb92a0 backup: add unbound config 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2016-10-12 22:51:35 +02:00
Arne Fitzenreiter
7e90cf38cb backup: fix vnstat path 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
 2016-02-29 21:53:41 +01:00
Michael Tremer
9e462c5971 backup: Add /etc/ipsec.user-post.conf 
This file can be manually edited by the user and should be included
in the backup.

Reported-by: Lars Schuhmacher <larsen007@web.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
 2015-08-01 20:40:55 +01:00
Stefan Schantl
9673754385 backup: Include sshd config file. 
The sshd config file was not included in the backups, so if the port
was switched from the default one to another one, the changed value was
correctly restored and displayed in the WUI but still the original sshd
config file was present and the default port has been used.

This issue is fixed by this commit.

Fixes #10446.
 2015-04-13 15:35:15 +02:00
Alexander Marx
6b7cbc8f33 vpn-statistic: move collectd.vpn to /var/ipfire/ovpn/ 
collectd.vpn needs to be within /var/ipfire/ovpn so that the
ovpnmain.cgi is able to write the status files from the n2n connections
to the file.
 2015-04-09 15:16:32 +02:00
Michael Tremer
35ef18de77 Add /etc/logrotate.d to backup. 2014-07-10 22:06:53 +02:00
Alexander Marx
6d8eb5dec7 Firewall: Renamed directory /var/ipfire/forward to /var/ipfire/firewall 2013-10-24 09:24:12 +02:00
Alexander Marx
6f348fcb9d Forward Firewall: edited include file of backup. 2013-08-09 14:13:07 +02:00
Alexander Marx
92788c464b Forward Firewall: deleted /var/ipfire/outgoing from backup 2013-08-09 14:07:12 +02:00
Michael Tremer
111c99ddfa Forward Firewall: applied all changes as diff and added new files. Also deleted c files from xtaccess and setdmzholes. 
Signed-off-by: Alexander Marx <amarx@ipfire.org>

Conflicts:
	config/backup/include
	lfs/configroot
	lfs/usb-stick
 2013-08-09 14:02:02 +02:00
Arne Fitzenreiter
9c55c65e05 dnsforward: add config to iso and updater. 2013-07-16 22:58:13 +02:00
Arne Fitzenreiter
3033567376 wireless-client: add wireless cfg to iso, backup and core71. 2013-07-06 19:49:59 +02:00
Alexander Marx
262f429733 Backup: Added directories for old firewall, so that this backup can be restored in the new firewall 2013-04-12 12:29:10 +02:00
Arne Fitzenreiter
083c1258bf backup: add vnstat,collectd and outgoingfw-macgroups to backup. 
fixes #10251
and additional the missing macgroups.
 2012-12-06 18:59:30 +01:00
Christian Schmidt
9fd6aa06b6 Added outgoing fw groups to backup. 2011-02-13 10:35:41 +01:00
Arne Fitzenreiter
e44fb0dc95 Add ipsec.user.* to backup. 2011-02-07 23:42:19 +01:00
Arne Fitzenreiter
f6a6ea8d5e Add aliases to backup and run setaliases at red start (if red=static only) 2009-07-06 19:29:58 +02:00
Maniacikarus
3fcb086ea0 Added qos.sh to backup include 
Finalized core16
Correted mpfire CGI
Updated hdparm
Deleted mpg123
 2008-08-16 11:02:00 +02:00
maniacikarus
901a50cfed MPFire CGI korrigiert 
Backupfunktionen fuer Addons begonnen


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@974 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-10-15 19:36:15 +00:00
maniacikarus
d089ce654c MPFire CGI Update 
Fehlende Datei in die Backup Include eingefuegt


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@972 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-10-14 15:17:50 +00:00
maniacikarus
f6504eb327 Ein weiteres Webradion hinzugefügt 
Backup include angepasst
Pakfire timeout auf 20 gesetzt
Fix im Networking Skript für any


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@949 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-10-06 10:10:24 +00:00
ms
bb2d1e47fb QoS.cgi speichert jetzt die TOS-Bits nach dem editieren wieder richtig. 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@803 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-08-22 18:07:20 +00:00
maniacikarus
d39a5cb6ed Backupklamotte erweitert 
Fehler im Disk Graphen gefixt
Kleine Anpassung am MPFire


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@712 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-07-19 17:08:25 +00:00
maniacikarus
8871b9f2fb MPFire erweitert 
Samba etwas angepasst
Pakfire ueberfluessigen Text entfernt
Tripwire Policy angepasst


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@702 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-07-17 19:39:18 +00:00
maniacikarus
69addbb810 Fuer den Urlfilter ein Background Image gemacht 
MPFire erweitert
Samba Pagerefresh korrigiert
Tripwire Pagerefreh korrigiert
Backup CGI sollte jetzt fertig sein zum Testen
vpnmain die beiden SHA2 Crypts entfernt
Snort init nochmal angepasst damit die PID alleine angelegt wird


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@682 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-07-13 18:49:27 +00:00
maniacikarus
8e8bbd9da3 kleine Korrektur in der Samba CGI 
IPFire Backup Loesung weiter gebaut
kleiner fix im dhcp init Skript


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@676 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-07-11 20:30:21 +00:00
maniacikarus
cf29614f54 Korrekturen im IDS System 
Division by 0 in den grafischen Firewallogs unterbunden
Backup Loesung fuer IPFire angefangen
fehlende Perl Module ins MPFire Paket eingebunden
Writeipac auf neue Config Types angepasst


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@666 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
 2007-07-09 16:51:43 +00:00