From 08bbd7e61dce3324e102e532976504801130f8e6 Mon Sep 17 00:00:00 2001
From: Greg Price <greg@zulipchat.com>
Date: Wed, 24 Jan 2018 14:00:50 -0800
Subject: [PATCH] settings: Slightly simplify EMAIL_BACKEND logic.

DEVELOPMENT is defined as just `not PRODUCTION`, but this code made
it look like things might be more complicated than that.
---
 tools/test-install/install | 17 +++++++++++++++--
 zproject/settings.py       |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/tools/test-install/install b/tools/test-install/install
index 5c1bcf2831..933899dcbf 100755
--- a/tools/test-install/install
+++ b/tools/test-install/install
@@ -37,9 +37,17 @@ if ! lxc-info -n "$BASE_CONTAINER_NAME" >/dev/null 2>&1; then
 fi
 
 while [ -z "$CONTAINER_NAME" ] || lxc-info -n "$CONTAINER_NAME" >/dev/null 2>&1; do
-    CONTAINER_NAME="$(mktemp -u zulip-install-"$RELEASE"-XXXXX)"
+    shared_dir="$(mktemp -d --tmpdir "$RELEASE"-XXXXX)"
+    CONTAINER_NAME=zulip-install-"$(basename "$shared_dir")"
 done
 
+message="$(cat <<EOF)"
+
+$CONTAINER_NAME
+$shared_dir
+EOF
+trap 'echo "$message"' EXIT
+
 if [ -d "$INSTALLER" ]; then
     installer_dir="$(readlink -f $INSTALLER)"
 else
@@ -49,8 +57,13 @@ fi
 
 mkdir -p /srv/zulip/test-install/pip-cache
 
+mkdir "$shared_dir"/upper "$shared_dir"/work "$shared_dir"/mnt
+mount -t overlay overlay \
+    -o lowerdir="$installer_dir",upperdir="$shared_dir"/upper,workdir="$shared_dir"/work \
+    "$shared_dir"/mnt
+
 lxc-copy --ephemeral --keepdata -n "$BASE_CONTAINER_NAME" -N "$CONTAINER_NAME" \
-         -m overlay="$installer_dir":/tmp/src/,bind=/srv/zulip/test-install/pip-cache:/root/.cache/pip
+         -m bind="$shared_dir"/mnt:/tmp/src/,bind=/srv/zulip/test-install/pip-cache:/root/.cache/pip
 
 run() {
     lxc-attach -n "$CONTAINER_NAME" -- "$@"
diff --git a/zproject/settings.py b/zproject/settings.py
index 0848c18b55..6012665fc6 100644
--- a/zproject/settings.py
+++ b/zproject/settings.py
@@ -1533,12 +1533,12 @@ DEFAULT_FROM_EMAIL = ZULIP_ADMINISTRATOR
 if EMAIL_BACKEND is not None:
     # If the server admin specified a custom email backend, use that.
     pass
-elif not EMAIL_HOST and PRODUCTION:
-    # If an email host is not specified, fail silently and gracefully
-    EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
 elif DEVELOPMENT:
     # In the dev environment, emails are printed to the run-dev.py console.
     EMAIL_BACKEND = 'zproject.email_backends.EmailLogBackEnd'
+elif not EMAIL_HOST:
+    # If an email host is not specified, fail silently and gracefully
+    EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
 else:
     EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'