Merge branch 'main'

kiekerjan · Jul 23, 2024 · e891322 · e891322
2 parents d545bb2 + 162e509
commit e891322
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,7 @@ Other updates:
 * Added an undocumented option to proxy websockets.
 * Internal improvements to the code to make it more reliable and readable.
 
-Version 69a released on July 21, 2024 corrects a setup failure.
+Version 69a (July 21, 2024) and 69b (July 23, 2024) correct setup failures.
 
 Version 68 (April 1, 2024)
 --------------------------

diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh
@@ -25,7 +25,7 @@ if [ -z "$TAG" ]; then
  if [ "$UBUNTU_VERSION" == "Ubuntu 22.04 LTS" ]; then
  # This machine is running Ubuntu 22.04, which is supported by
  # Mail-in-a-Box versions 60 and later.
- TAG=v69a
+ TAG=v69b
  elif [ "$UBUNTU_VERSION" == "Ubuntu 18.04 LTS" ]; then
  # This machine is running Ubuntu 18.04, which is supported by
  # Mail-in-a-Box versions 0.40 through 5x.

diff --git a/setup/management.sh b/setup/management.sh
@@ -54,7 +54,7 @@ hide_output $venv/bin/pip install --upgrade \
 # Create a backup directory and a random key for encrypting backups.
 mkdir -p "$STORAGE_ROOT/backup"
 if [ ! -f "$STORAGE_ROOT/backup/secret_key.txt" ]; then
- umask 077; openssl rand -base64 2048 > "$STORAGE_ROOT/backup/secret_key.txt"
+ (umask 077; openssl rand -base64 2048 > "$STORAGE_ROOT/backup/secret_key.txt")
 fi