external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

merge upstream

This commit is contained in:
KiekerJan 2022-07-20 16:19:13 +02:00
parent 18d18366e3 3c3d62ac27
commit f8ae130a01
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -24,6 +24,11 @@ No features of Mail-in-a-Box have changed in this release, but with the newer ve
In Development In Development
-------------- --------------
Version 57a (June 19, 2022)
---------------------------
* The Backblaze backups fix posted in Version 57 was incomplete. It's now fixed.
Version 57 (June 12, 2022) Version 57 (June 12, 2022)
-------------------------- --------------------------

4
setup/bootstrap.sh
View File

@ -29,7 +29,7 @@ if [ -z "$TAG" ]; then
elif [ "$UBUNTU_VERSION" == "Ubuntu 20.04 LTS" ]; then elif [ "$UBUNTU_VERSION" == "Ubuntu 20.04 LTS" ]; then
# This machine is running Ubuntu 20.04, which is supported by # This machine is running Ubuntu 20.04, which is supported by
# Mail-in-a-Box versions 56 and later. # Mail-in-a-Box versions 56 and later.
TAG=v56 TAG=v57a
elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then
# This machine is running Ubuntu 18.04, which is supported by # This machine is running Ubuntu 18.04, which is supported by
# Mail-in-a-Box versions 0.40 through 5x. # Mail-in-a-Box versions 0.40 through 5x.
@ -37,7 +37,7 @@ if [ -z "$TAG" ]; then
echo "Please immediately begin to migrate your information to" echo "Please immediately begin to migrate your information to"
echo "a new machine running Ubuntu 22.04. See:" echo "a new machine running Ubuntu 22.04. See:"
echo "https://mailinabox.email/maintenance.html#upgrade" echo "https://mailinabox.email/maintenance.html#upgrade"
TAG=v56 TAG=v57a
GITSRC=miab GITSRC=miab
elif [ "$UBUNTU_VERSION" == "Ubuntu 14.04 LTS" ]; then elif [ "$UBUNTU_VERSION" == "Ubuntu 14.04 LTS" ]; then
# This machine is running Ubuntu 14.04, which is supported by # This machine is running Ubuntu 14.04, which is supported by

3
setup/management.sh
View File

@ -51,7 +51,8 @@ hide_output $venv/bin/pip install --upgrade \
rtyaml "email_validator>=1.0.0" "exclusiveprocess" \ rtyaml "email_validator>=1.0.0" "exclusiveprocess" \
flask dnspython python-dateutil expiringdict \ flask dnspython python-dateutil expiringdict \
qrcode[pil] pyotp \ qrcode[pil] pyotp \
"idna>=2.0.0" "cryptography==2.2.2" boto psutil postfix-mta-sts-resolver b2sdk "idna>=2.0.0" "cryptography==2.2.2" psutil postfix-mta-sts-resolver \
b2sdk==1.14.1 boto
# CONFIGURATION # CONFIGURATION