Commit Graph

164 Commits

Author SHA1 Message Date
Stefan Schantl
8c27372438 backup.pl: Run snort to suricata converter when a backup gets restored.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2019-01-29 08:40:34 +01: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
b5b8920cf0 bird: Add forgotten file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-12-01 16:13:25 +00:00
Michael Tremer
3eea5c6f3a nfs: Add backup include file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-28 19:08:17 +00:00
Michael Tremer
63dc6532d1 shairport-sync: Add backup include file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-11 17:34:11 +00:00
Michael Tremer
014b235a06 dehydrated: New package
This is a light client for Let's Encrypt which is implemented
in bash and does not have any other dependencies apart from
openssl and curl.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-09 14:29:04 +00:00
Michael Tremer
01c2ea6b83 observium-agent: New package
This ships the observium agent including a couple of
modules.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-07 20:07:53 +00:00
Michael Tremer
4f10c0b3a3 backup: Fix expanding glogging
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-11-01 10:27:09 +00:00
Michael Tremer
c7b7a70deb backup: Rewrite backup script
The old script was quite messy and written in perl although
it was only calling shell commands.

This version is now written in shell although keeping the .pl
file suffix and is a drop-in replacement.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-10-31 14:22:56 +00: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
Michael Tremer
58e0aa18cc frr: Add backup include file
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-10-31 09:30:44 +00:00
Stefan Schantl
2d475a3c6c Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata 2018-09-26 14:49:34 +02:00
Michael Tremer
a6c190818a backup: Fix deleting backup files
Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-09-20 14:21:41 +01: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
Matthias Fischer
84578512f5 Fixes for 'backup.pl' (Bug #11816)
Hi,

Fixes #11816
(https://bugzilla.ipfire.org/show_bug.cgi?id=11816 and
https://bugzilla.ipfire.org/attachment.cgi?id=608):

"[root@ipfire ~]# backupctrl exclude
...
tar: The following options were used after any non-optional arguments in
archive create or update mode.  These options are positional and affect
only arguments that follow them.  Please, rearrange them properly.
tar: --exclude-from '/var/ipfire/backup/exclude.user' has no effect
tar: Exiting with failure status due to previous errors"

Please test - I got no errors anymore.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-14 20:38:47 +01:00
Michael Tremer
6064cd87cc Revert "avahi: Drop package"
This reverts commit aa6ee515c5.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-08-10 11:11:48 +01:00
Erik Kapfer
291bfda71e backup: Exclude OpenVPNs ovpn.cnf from backup
This fixes also bug #11773

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-06-19 11:30:40 +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
Michael Tremer
2d5940daca Drop MySQL
This is outdated and still on 5.0.x and nobody volunteered to
update this package.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-02-12 12:05:46 +00:00
Michael Tremer
333915f5cf Drop owncloud
We are going to remove PHP and owncloud requires it

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-05 13:28:59 +00:00
Michael Tremer
fbcb5b749a Drop mediatomb
This didn't build and run in ages and has been removed from
the repositories quite a while ago.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2018-01-05 13:26:33 +00:00
Michael Tremer
b2d4fa028f Drop cacti
This package was discontinued upstream and seems to be
a bit more lively again. However, nobody of the team
wants to maintain cacti. Therefore this is being dropped
for now.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-12-16 12:35:12 +00:00
Michael Tremer
56720befc7 Drop vsftpd which isn't actively maintained any more
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-28 17:30:08 +00:00
Michael Tremer
d38edcf8b4 pound: Drop package which isn't very actively maintained any more
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-11-28 17:29:55 +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
Michael Tremer
e65d5a0061 imspector: Drop package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-05-22 20:03:01 +01:00
Michael Tremer
076ad71576 avahi: Drop package
The daemon locks up when starting up in avahi_log_info() and
probably the other logging functions, too.

Since avahi is not really used a lot in the distribution,
has been in testing for four years and has virtually no users
I am going to drop it instead of wasting time on fixing this.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-12 17:49:45 +01:00
Michael Tremer
5056b4f104 Drop mldonkey files
The packages has been dropped years ago. However, some
files remained in the source tree.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-01-16 16:53:35 +00: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
Jonatan Schlag
3a4a8b055b Libvirt: Add backup
The directory /etc/libvirt is backed up on uninstallation  and is
restored on installation.

Alle Files in  /var are commented in the rootfile so they are not
removed on uninstallation.
Because of the fact that the directories are not shipped with the
package they were created at installation time.
The permissions of 3 directories are changed because the qemu user is
nobody and the qemu group is kvm, so the permissions must be nobody:kvm

Fixes: #11151

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-08-02 16:07:33 +01:00
Stefan Schantl
a11aaa91b3 guardian: Update to 2.0.
Update guardian to the re-written version.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2016-07-29 13:19:14 +02:00
Michael Tremer
0c265f5717 nginx: Update to 1.8.1
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-07-29 09:04:04 +01:00
Michael Tremer
71f578bbfc freeradius: New package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2016-07-19 14:54:50 +01: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
Arne Fitzenreiter
b209d63dc0 backup: exclude lm_sensors config.
this config is hardware dependend and will autodetected at boot.
fixes #10865

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2015-10-31 17:04:47 +01:00
Alexander Marx
de849bc570 dma: New package
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-08-21 09:38:16 +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
Arne Fitzenreiter
cb3c00e01e cyrus-imapd: add backupinclude. 2015-05-31 16:02:39 +02:00
Matthias Fischer
454a80d1db netsnmpd: Update to 5.7.3, include backup
Conflicts:
	lfs/netsnmpd
2015-05-31 11:16:25 +02: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
Arne Fitzenreiter
0fbba54e82 Merge branch 'master' into next
Conflicts:
	lfs/monit
2015-04-11 21:58:09 +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
261121f1df Remove some left-over files 2015-03-18 15:18:56 +01:00
Arne Fitzenreiter
5604dc748d backup: make include file parsing more robust. 2015-03-06 17:22:18 +01:00