Commit Graph

2310 Commits

Author SHA1 Message Date
KiekerJan 210d9f08dc simplify utils.py#shell method used by unbound-control call 2022-11-05 21:04:05 +01:00
KiekerJan 16728860f4 add not set case to blacklist lookup 2022-11-03 08:27:56 +01:00
KiekerJan ebc5f06d61 merge upstream 60.1 2022-10-30 23:01:19 +01:00
KiekerJan 30b994f2b4 remove unused configuration params 2022-10-22 17:19:07 +02:00
KiekerJan cadbda12cc fix functions error 2022-10-15 16:54:32 +02:00
KiekerJan 9a842cbc1d Merge branch 'mergeupstream2204' 2022-10-15 16:40:16 +02:00
KiekerJan fe52334288 merge upstream 2022-10-15 16:38:47 +02:00
KiekerJan 4914b0c423 add logging 2022-10-15 07:59:25 +02:00
KiekerJan 600eee12b5 explicitly install file package 2022-09-18 13:11:35 +02:00
KiekerJan 703981b31a fix hashes of nextcloud installs 2022-09-17 17:03:41 +02:00
KiekerJan 5628c1e674 merge master 2022-09-17 16:53:08 +02:00
KiekerJan 15735fc59c Merge branch 'master' into mergeupstream2204 2022-09-17 16:48:02 +02:00
KiekerJan 9ee26d3ef1 merge upstream changes proposed for 2204 2022-09-17 16:41:35 +02:00
KiekerJan e2da1d5f37 merge upgrade path for nextcloud 2022-09-17 16:39:42 +02:00
KiekerJan a0937290b7 correct reference in fail2ban jail to nextcloud log 2022-09-16 23:29:30 +02:00
KiekerJan 191fd62835 make sure nextclouds config.php is only readable by user www-data 2022-09-14 14:44:09 +02:00
KiekerJan 9327a1df4f merge proposed boto chagnes 2022-09-12 22:58:52 +02:00
KiekerJan 0f510d97c9 correct config file handling 2022-09-08 22:32:52 +02:00
KiekerJan e3a91ece00 move nextcloud logging to syslog 2022-09-08 22:23:07 +02:00
KiekerJan c74069923f update nextcloud to 24.0.5 2022-09-08 20:35:39 +02:00
KiekerJan a8aa3675bc add postfix aggressive jail 2022-09-04 20:57:50 +02:00
KiekerJan 1ce9766204 merge upstream changes to update to ubuntu 2204 2022-09-04 20:52:56 +02:00
KiekerJan 197a142043 check returned nameserver values 2022-08-26 11:34:18 +02:00
KiekerJan b051137f36 more resilient nameserver usage in query dns 2022-08-26 11:29:23 +02:00
KiekerJan 0058583913 update roundcube email to 1.6, update plugins and add logrotate entry 2022-08-19 19:59:38 +02:00
KiekerJan f8ae130a01 merge upstream 2022-07-20 16:19:13 +02:00
KiekerJan 18d18366e3 Merge branch 'master' of https://github.com/kiekerjan/mailinabox 2022-07-20 16:15:30 +02:00
KiekerJan 9c80ce8ff6 backup root is configurable 2022-07-20 16:15:16 +02:00
KiekerJan 5787f0dfd5 fix access rights of after-backup script 2022-07-03 18:29:08 +02:00
Joshua Tauberer 3c3d62ac27 Version 57a 2022-06-19 08:58:09 -04:00
Joshua Tauberer d829d74048 Pin b2sdk to version 1.14.1 in the virtualenv also
We install b2sdk in two places: Once globally for duplicity (see
9d8fdef9915127f016eb6424322a149cdff25d7 for #2125) and once in
a virtualenv used by our control panel. The latter wasn't pinned
when the former was but should be to fix new Python compatibility
issues.

Anyone who updated Python packages recently (so anyone who upgraded
Mail-in-a-Box) started encountering these issues.

Fixes #2131.

See https://discourse.mailinabox.email/t/backblaze-b2-backup-not-working-since-v57/9231.
2022-06-18 13:15:59 -04:00
KiekerJan 727d84004f add configurable backup dir to status checks 2022-06-13 20:25:48 +02:00
KiekerJan 69e15fa942 merge upstream v57 2022-06-13 20:07:50 +02:00
Joshua Tauberer 2aca421415 Version 57 2022-06-12 08:18:42 -04:00
Joshua Tauberer 99474b348f Update backup to be compatible with duplicity 0.8.23
We were using duplicity 0.8.21-ppa202111091602~ubuntu1 from the duplicity PPA probably until June 5, which is when my box automatically updated to 0.8.23-ppa202205151528~ubuntu18.04.1. Starting with that version, two changes broke backups:

* The default s3 backend was changed to boto3. But boto3 depends on the AWS SDK which does not support Ubuntu 18.04, so we can't install it. Instead, we map s3: backup target URLs to the boto+s3 scheme which tells duplicity to use legacy boto. This should be reverted when we can switch to boto3.
* Contrary to the documentation, the s3 target no longer accepts a S3 hostname in the URL. It now reads the bucket from the hostname part of the URL. So we now drop the hostname from our target URL before passing it to duplicity and we pass the endpoint URL in a separate command-line argument. (The boto backend was dropped from duplicity's "uses_netloc" in 74d4cf44b1 (f5a07610d36bd242c3e5b98f8348879a468b866a_37_34), but other changes may be related.)

The change of target URL (due to both changes) seems to also cause duplicity to store cached data in a different directory within $STORAGE_ROOT/backup/cache, so on the next backup it will re-download cached manifest/signature files. Since the cache directory will still hold the prior data which is no longer needed, it might be a good idea to clear out the cache directory to save space. A system status checks message is added about that.

Fixes #2123
2022-06-12 08:17:48 -04:00
Joshua Tauberer 8bebaf6a48 Simplify duplicity command line by omitting rsync options if the backup target type is not rsync 2022-06-11 15:12:31 -04:00
KiekerJan cb87310c73 update contact and calendar nextcloud apps 2022-06-05 23:56:35 +02:00
jbandholz 9004bb6e8e
Add IPV6 addresses to fail2ban ignoreip (#2069)
Update jails.conf to include IPV6 localhost and external ip to ignoreip line.  Update system.sh to include IPV6 address in replacement.  See mail-in-a-box#2066 for details.
2022-06-05 09:40:54 -04:00
m-picc 69d8fdef99
Specify b2sdk version 1.14.1 (#2125)
pin b2sdk version to 1.14.1 to resolve exception that occurs when attempting to use backblaze backups. See https://github.com/mail-in-a-box/mailinabox/issues/2124 for details.
2022-06-05 09:24:32 -04:00
KiekerJan 02f2a34bcf remove deprecated method call 2022-05-30 19:37:00 +02:00
KiekerJan f575b1c2a2 add documentation 2022-05-29 11:53:24 +02:00
KiekerJan 334df74e49 ensure fail2ban is enabled 2022-05-27 18:12:50 +02:00
kiekerjan f91c8cc7e3
Update README.md 2022-05-25 22:51:06 +02:00
kiekerjan 639d1fc77b
Update README.md 2022-05-25 22:48:51 +02:00
KiekerJan c3750426df fix coding error 2022-05-25 22:47:20 +02:00
kiekerjan f0f3c7a442
Merge pull request #12 from kiekerjan/master
Merge master into development branch
2022-05-25 22:33:19 +02:00
KiekerJan 2a6ecd38b3 now really merge 2204 changes 2022-05-25 22:26:08 +02:00
KiekerJan 6f8242110d merge 2204 specific changes 2022-05-25 13:24:33 +02:00
KiekerJan a2a2e7ce24 nextcloud update 2022-05-24 22:10:48 +02:00
KiekerJan 982394dc69 add missing trailing slash 2022-05-22 00:40:00 +02:00