Commit Graph

186 Commits

Author SHA1 Message Date
Arne Fitzenreiter
5562f26f69 vnstat: remove wrong tag file
fixes #12305

I had created this tag file to ship the folder but vnstat doesn't like empty files.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-03-26 17:56:23 +00:00
Erik Kapfer
a8c6cd6322 keepalived: Update to version 2.0.20 .
Since this update is a mayor version update, it brings a lot of changes.
The changelog can be found in here --> http://www.keepalived.com/changelog.html .
Added /etc/sysconfig/keepalived in ROOTFILE and in backup/includes.

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-03-21 15:59:38 +00:00
Arne Fitzenreiter
592be1d206 bluetooth: drop outdated bluetooth addon
The cgi support only rfcomm modem dialup. This is not used by modern hardware.
Also the used bluez stack version is outdated long time.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Acked-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-03-21 15:41:22 +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
Michael Tremer
31ba6f6fc9 dehydrated: Fix various syntax errors
* The backup include file was missing a leading slash
which caused no files to be backed up.

* The shell escaping was broken so a new configuration file
was useless.

Fixes: #12297
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-02-17 21:42:04 +00:00
Michael Tremer
aef3c56c65 cyrus-imapd: Drop package
This package is outdated and unmaintained for many many years.
I am not sure if this even works and if there are any users.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-02-16 16:04:46 +00:00
Michael Tremer
d8f7b45f35 dnsdist: Update to 1.4.0
This patch updates dnsdist to the latest release.

Additionally it includes /etc/sysconfig/dnsdist in the backup
and enables DNS-over-TLS.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-02-15 11:04:44 +00:00
Arne Fitzenreiter
6df8a22b8a core141: correct move of nobeeps flag
in core139 there was a syntax error, and it was missed in
backup converter also.

fixes #12273

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-26 13:07:08 +01:00
Arne Fitzenreiter
61cc563558 Merge remote-tracking branch 'ms/next-dns-ng' into next 2020-01-13 21:42:49 +00:00
Michael Tremer
44cc9a3d57 amazon-ssm-agent: New package
AWS Systems Manager Agent (SSM Agent) is Amazon software that can be
installed and configured on an Amazon EC2 instance, an on-premises
server, or a virtual machine (VM). SSM Agent makes it possible for
Systems Manager to update, manage, and configure these resources. The
agent processes requests from the Systems Manager service in the AWS
Cloud, and then runs them as specified in the request. SSM Agent then
sends status and execution information back to the Systems Manager
service by using the Amazon Message Delivery Service.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-01-11 20:33:36 +00:00
Michael Tremer
ecbf66761f DNS: Add converter to migrate settings
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-01-07 10:43:19 +00:00
Michael Tremer
1a23cf7324 bird: Fix path of configuration file in backup
The backup did not pack the configuration file
due to an incorrect path.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-11-30 09:51:23 +00:00
Tim FitzGeorge
28797d488e Restart logging after restoring backup
Send SIGHUP to syslogd and suricata after restoring backup.  This ensures that
if the restored backup includes log files that any new log messages get
appended to the restored log files.  Otherwise they will be written to the
old log files which are pending deletion.

httpd is told to restart using apachectl, which is the equivalent of sending
a signal. 'graceful' (USR1) is used rather than 'restart' (HUP) because the
latter immediately kills the process restoring the backup, preventing
converters from running.

Fixes: 12196
Signed-off-by: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2019-10-14 17:27:54 +00:00
Michael Tremer
4a53156001 keepalived: Backup the whole configuration directory
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-08-10 03:12:04 +01:00
Michael Tremer
b0ec4158f3 miau: Drop package
This is not maintained since 2010

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-05-29 15:24:29 +01:00
Michael Tremer
fea27a56f7 haproxy: Backup certificates, too
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-16 13:23:17 +01:00
Michael Tremer
175f5c060e backup: Allow passing name of tarball for creation/restore
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-16 13:22:10 +01:00
Alexander Koch
41b7369f80 zabbix_agentd: Bugfix for /etc/sudoers.d/zabbix.user
Files containing an '~' or '.' are ignored by sudo when placed in the includedir /etc/sudoers.d This makes the file useless. The file is renamed to "zabbix" instead of "zabbix.user" to fix this.

See: https://www.sudo.ws/man/1.8.13/sudoers.man.html#Including_other_files_from_within_sudoers

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-04-11 07:55:10 +01:00
Michael Tremer
5b8ff1ccb6 dnsdist: Add backup include
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-18 02:54:30 +00:00
Michael Tremer
01604708c3 Merge remote-tracking branch 'stevee/next-suricata' into next 2019-03-14 13:19:35 +00:00
Alexander Koch
06fc6170a2 zabbix_agentd: New addon
New addon for monitoring IPFire by Zabbix Monitoring (https://www.zabbix.com/features).
See https://forum.ipfire.org/viewtopic.php?f=52&t=22039 and https://lists.ipfire.org/pipermail/development/2019-February/005324.html for further details.

Best regards,
Alex

Signed-off-by: Alexander Koch <ipfire@starkstromkonsument.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2019-03-08 09:55:18 +00:00
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