Commit Graph

239 Commits

Author SHA1 Message Date
Peter Müller
bbbb0b9e01 backup(.pl): Replace OpenVPN DH parameter with ffdhe4096
This ensures restoring a backup won't silently bring back an insecure
Diffie-Hellman parameter (which could also not be inspected through the
web interface anymore).

Reported-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
2022-12-17 14:46:32 +00:00
Michael Tremer
233baacd67 backup: Update OpenVPN CRL
After a backup is restored, the CRL might be out of data and client
won't be able to connect to the server any more.

This will immediately update the CRL should it require an update.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-10-24 09:06:16 +00:00
Peter Müller
d574941b90 Merge branch 'temp-stevee-ipblocklist-final' into next 2022-07-10 08:20:15 +00:00
Peter Müller
8df2cfb9c7 backup.pl: Delete directives for dropped OpenVPN convert script
See 0b6d12adae.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
2022-07-09 15:04:26 +00:00
Peter Müller
c1a5a49b47 backup.pl: Include logwatch summary into backups as well
Fixes: 12827
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
2022-07-09 15:04:26 +00:00
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
Robin Roevens
092330b128 zabbix_agentd: Sudoers file reorganization
- Remove sudoers file 'zabbix' in favour of new IPFire managed
  'zabbix_agentd' and user managed 'zabbix_agentd_user' which is
  included in the backup
- Provide migration of old sudoers file 'zabbix' or 'zabbix.user' to
  new zabbix_agentd_user sudoers file if it was modified by user.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-06 09:57:40 +00:00
Robin Roevens
e2d54d57d4 zabbix_agentd: Configfile reorganization
- Restrict default main config to only the bare minimum options
  and add upstream provided config as example file.
- Remove /etc/zabbix_agentd from backup and instead add only
  zabbix_agentd.conf and subdirs 'scripts' and 'zabbix_agentd.d' to
  the backup.
- Move ipfire managed userparameter_pakfire.conf from
  user managed dir /etc/zabbix_agentd/zabbix_agent.d to
  ipfire managed dir /var/ipfire/zabbix_agentd/userparameters
- Add Include line to existing zabbix_agentd.conf to include
  the new ipfire managed config dir /var/ipfire/zabbix_agentd/...
- Add and include mandatory IPFire specific agent configuration
  which should never be changed by the user.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-06 09:57:40 +00:00
Robin Roevens
1d00837e7e zabbix_agentd: Fix agent modules dir and few minor bugs
- Add agent modules-dir to backup
- Remove original, not used agent modules dir from rootfile
- Create modules-dir during install if it not already exists
- bugfix: Add existence check before creating log-dir, avoiding error
             messages if it already exists from a previous install
- bugfix: add extract_backup_includes to update.sh script to make
              sure backup includes exist when backup is taken.

Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
2022-07-06 09:57:40 +00:00
Peter Müller
4d4f5df0c8 Merge branch 'temp-stevee-idsv4' into next 2022-05-05 16:07:41 +00:00
Stefan Schantl
b3dbe9ef64 backup.pl: Run convert-ids-backend-files converter.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2022-04-16 15:57:34 +02: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
Michael Tremer
260d9e7dd8 Merge branch 'master' into next 2022-03-30 15:53:27 +00:00
Michael Tremer
d5d3748b02 backup: Move empty check to the correct place
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-30 15:50:55 +00: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
e546e1038a Merge branch 'master' into next 2022-03-30 13:51:38 +00:00
Michael Tremer
b275771fdd backup: Only list files that exist
This will prevent tar from throwing any errors later on

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-30 13:43:25 +00:00
Michael Tremer
4f0e7f24f2 backup: Ignore any empty lines in backup include list
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-30 13:43:25 +00:00
Michael Tremer
13f6473a4f backup: Fix broken globbing expansion
This patch fixes globbing expansion in the backup include file list
which got broken in c7e0d73e7c.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Tested-by: Bernhard Bitsch <bernhard.bitsch@ipfire.org>
2022-03-30 13:43:25 +00:00
Daniel Weismueller
d6b2b662da Add backup/include for cups
To solve the behavior discribed in bug 12404 I added the path
 /var/ipfire/cups to the backup.

Signed-off-by: Daniel Weismueller <daniel.weismueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-11 15:54:40 +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
Michael Tremer
3f8e70f6b3 backup: Don't restore excluded files
Sometimes, we restore a backup that has been created earlier before
exclude files have been changed. To avoid overwriting those files, we
will consider the exlude list upon restore.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-07 18:51:20 +00:00
Michael Tremer
ca1fdb6954 backup: Exclude oinkmaster.conf
This file is a system configuration file and does not contain any
configruation from the user.

Since it can be overwritten in a backup and restored to an older state,
this can cause problems such as #12788.

Fixes: #12788
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-07 18:51:17 +00:00
Michael Tremer
fc717041c4 backup: Abort when the backup could not be extracted
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2022-03-07 18:51:14 +00:00
Peter Müller
86cf6898aa Merge branch 'master-IDSv3' into temp-c164-development 2022-01-14 14:05:10 +00:00
Stefan Schantl
4aa1382e22 backup.pl: Launch convert-ids-multiple-providers if neccessary.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2021-12-19 13:23:44 +01: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
Michael Tremer
45a5df5a5e backup: Fork ISO job into the background in CGI script
In order to be able to run the ISO command on command line it is helpful
that the script does not go into background halfway through the process.

We should rather start it as a background job straight from the CGI
script.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-12-14 14:39:26 +01:00
Michael Tremer
51ed815f5e backup: Create tarball in one pass
This patch is changing the behaviour of the backup script so that it
creates one tarball and compresses it in one go.

This will save storing the original tarball on disk before compressing
it which on my test system requires significant disk space.

This patch also solves a bug where the backup file included with the ISO
image could not be extracted because it was not gzip-compressed when it
was expected to be.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-12-14 14:39:21 +01:00
Michael Tremer
d9db91609f backup: Use filename as specified on console
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-12-14 14:39:17 +01:00
Adolf Belka
71b06657f9 backup definitions: housekeeping to remove orphaned definitions
- check_mk_agent, client175 & lcr are addons that have been removed so the backup
   definitions are no longer required.
- dma is not a package but a core program and has its config backup requirements
   built into the core backup include file so the addon backup definition is not
   used or needed.
- No issues found in the build after these files were removed.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2021-10-30 14:47:21 +00:00
Adolf Belka
6befc952cc minidlna: Add backup capability - bug#12710
- Backup definition missing - created ro backup config file
- Update of rootfile
- Addition of backup definition install into lfs file
- Addition of restore and backup statements into install.sh and uninstall.sh pak scripts

Fixes: 12710
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2021-10-22 16:14:43 +00:00
Adolf Belka
d2c2025b3d backup/exclude: unbound is missing hosts.conf include after restoring a backup of an older version
- Added unbound.conf to backup/exclude list to fix bug #12441

Fixes: #12441
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2021-10-22 15:59:05 +00:00
Peter Müller
c62adbc448 Drop unmaintained add-on lcd4linux
This package has not received any updates or attention within the last
three years. It's sole known upstream URL (https://ssl.bulix.org/projects/lcd4linux/)
returns a HTTP error 404 nowadays, and the author was unable to locate
any upstream source that appears to be still maintained today.

Given the status quo, bugs in lcd4linux cannot be reported properly,
security issues won't be addressed (by anybody else then ourselves), and
technical questions cannot be clarified aside a reverse engineering
approach.

We should not allow such an add-on to be installed on a firewall system.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-06-03 09:16:13 +00:00
Adolf Belka
e5f3e0397c backup.pl: Fix #12626 backup/include.user entries will not override backup/exclude
- Current situation is that any restrictions in the exclude file will not
   be overwritten by the include.user file
- For example the global exclude file has *.tmp preventing any tmp files
   being backed up from the globally included IPFire files
   If a user has some specific tmp files they want to backup and include
   them in the include.user file they will not override the global
   exclude file.
- This fix does the backup of the global and user backups as two separate
   events and then appends them. This means that any tmp files in the
   include.user file will be backed up.
- The backups are created as a global tar file and then have the user
   tar file appended and then the combined file gzipped and given the .ipf
   suffix. This has to be done this was as gzipped files can not be
   appended to each other whereas tar files can.

Fixes: 12626
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-25 09:43:57 +00:00
Peter Müller
e55b268a4b Drop SANE add-on
As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-20 09:31:18 +00:00
Peter Müller
a326c9a623 Drop Asterisk add-on
As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-20 09:30:48 +00:00
Peter Müller
a7da7bcb07 Drop motion add-on
As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-20 09:30:05 +00:00
Adolf Belka
7300386bab pmacct: New addon
- What is it?
   pmacct is a monitoring tool for network management tasks. Data collected
   can be used for analysis and troubleshooting purposes to maintain the
   health of the network. pmacct can collect, replicate and export network
   information. It can cache in memory tables, store persistently to SQLite3
   and output to flat-files like CSV, formatted, and JSON.
- Why is it needed?
   To monitor data usage (IP-based or MAC-based data accounting) down to the
   client level. Net-Traffic will monitor traffic for the entire RED, GREEN,
   etc. networks, but it cannot pinpoint which client is using lots of data.
   Connections will take a snapshot but not show day by day sums. pmacct can
   help admins keep tabs on users that use too much data.
- What are the use cases?
   An ISP may implement data caps and if the limit is over-run then you have
   to pay for every additional xxGB of data used. Typical charges can be
   around $10 per 50GB. With pmacct you can identify the high users and take
   action, hopefully before the limit is breached.
- This is being introduced as a command line only tool. However, at a later
   date, if it is useful to enough additional users a WUI page could be
   developed as discussed in the development mailing list
   https://lists.ipfire.org/pipermail/development/2021-January/009174.html
- Changes in V2 version
-   Initscript is using IPFire template and installed with IPFire method.
-   All other daemons except pmacct and pmacctd have been removed from the install.
-   Example conf files have been removed from /etc/pmacct
      Both example conf files are described in the pmacct wiki draft.

Tested-by:     Jon Murphy <jon.murphy@ipfire.org>
Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
Signed-off-by: Erik Kapfer <ummeegge@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-05-11 16:44:46 +00:00
Michael Tremer
5283b400ef Drop pakfire3
This version is outdated and not usable on IPFire 2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-07 13:53:36 +00:00
Michael Tremer
1e8767976c nagios_nrpe: Backup configuration before update
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-11 15:09:40 +00:00
Adolf Belka
d0d63bbbee apcupsd: addition of backup/includes definition
Added a backup/includes file for apcupsd to backup the
/etc/apcupsd/ directory where all the configuration files
are stored. Currently there is no backup available to
save the state of any changes carried out to the configuration
or action files.
Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-11-23 15:12:54 +00:00
Michael Tremer
1e2c442c9e samba: Add support for custom configuration changes
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-11-09 18:43:15 +00:00
Michael Tremer
97722ab69d samba: Remove printer management
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-10-13 17:06:16 +01:00
Adolf Belka
d8f992b349 bacula: Update to backup/includes definition
- Modified backup/includes file to backup the /var/bacula/working directory contents
	rather than explicitly naming the state filename.
	State filename could be varied if user modifies the port number for the file daemon
	as the port number is part of the state filename
Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-09-30 10:00:01 +00:00
Stefan Schantl
af7f9fc43d :xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to-libloc
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2020-07-03 18:48:30 +02:00
Adolf Belka
3b887740e8 bacula: Update to 9.6.5
- Update bacula from version 9.0.6 to 9.6.5
  Version 9.0.6 is over two and a half years old.
- Update config options in lfs to include bacula recommended smartalloc option.
  "This enables the inclusion of the Smartalloc orphaned buffer detection
  code. This option is highly recommended. Because we never build without this option,
  you may experience problems if it is not enabled. In this case, simply re-enable the
  option. We strongly recommend keeping this option enabled as it helps detect memory
  leaks. This configuration parameter is used while building Bacula"
- Add install, uninstall and update files in src/paks/bacula
- Updated backup/includes to backup the config file and the File Daemon state file.

Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-06-19 17:14:59 +00:00
Stefan Schantl
f1d982cce6 Add convert-to-location converter.
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
2020-06-15 18:21:57 +02:00
Michael Tremer
b61a9a2716 shairport-sync: Update to 3.3.6
This patch also fixes the backup.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-05-17 07:53:25 +00:00
Michael Tremer
18d000c486 netatalk: New package
This package adds a daemon for Apple's File Protocol

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-05-09 12:03:59 +00:00