From 7f27ab952bcb722469aeb8c4dda169f99de643e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Mon, 29 Jan 2018 18:05:26 +0100
Subject: [PATCH] Fix email sending

---
 README.md                                  | 10 ++++++++++
 docker-compose.yml                         |  1 -
 edxapp/config/production_common.py         |  4 ----
 edxapp/config/templates/cms.env.json.templ |  3 ++-
 edxapp/config/templates/lms.env.json.templ |  1 +
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 61ae5ac..f1192fc 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,16 @@ And then, to stop all services:
 
     make stop
 
+### Logging
+
+To view the logs from all containers:
+
+    docker-compose logs -f
+
+To view the logs from just one container, for instance the web server:
+
+    docker-compose logs -f
+
 ### Development
 
 Open a bash in the lms:
diff --git a/docker-compose.yml b/docker-compose.yml
index d617e72..2e19f42 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,6 @@ services:
       - ./data/rabbitmq:/var/lib/rabbitmq
 
   # Simple SMTP server
-  # TODO this smtp server doesn't send any email. Fix this.
   smtp:
     image: namshi/smtp
 
diff --git a/edxapp/config/production_common.py b/edxapp/config/production_common.py
index 1cc8767..509b974 100644
--- a/edxapp/config/production_common.py
+++ b/edxapp/config/production_common.py
@@ -6,10 +6,6 @@ update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
 MEDIA_ROOT = "/openedx/data/uploads/"
 FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
 
-# Don't rely on AWS for sending email
-EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-EMAIL_HOST = 'smtp'
-
 # We need to activate dev_env for logging, otherwise rsyslog is required (but
 # it is not available in docker).
 LOGGING = get_logger_config(LOG_DIR,
diff --git a/edxapp/config/templates/cms.env.json.templ b/edxapp/config/templates/cms.env.json.templ
index 7c7b415..5e97112 100644
--- a/edxapp/config/templates/cms.env.json.templ
+++ b/edxapp/config/templates/cms.env.json.templ
@@ -6,7 +6,7 @@
   "OAUTH_OIDC_ISSUER": "http://localhost:8000/oauth2",
   "PLATFORM_NAME": "${PLATFORM_NAME}",
   "FEATURES": {
-    "PREVIEW_LMS_BASE": "localhost:8000"
+    "PREVIEW_LMS_BASE": "${LMS_HOST}"
   },
   "LMS_ROOT_URL": "http://${LMS_HOST}",
   "CMS_ROOT_URL": "http://${CMS_HOST}",
@@ -16,6 +16,7 @@
   "CELERY_BROKER_TRANSPORT": "amqp",
   "MEDIA_ROOT": "/openedx/data/uploads/",
   "STATIC_ROOT_BASE": "/openedx/data/staticfiles",
+  "EMAIL_BACKEND": "django.core.mail.backends.smtp.EmailBackend",
   "EMAIL_HOST": "smtp",
   "EMAIL_PORT": 9025,
   "CACHES": {
diff --git a/edxapp/config/templates/lms.env.json.templ b/edxapp/config/templates/lms.env.json.templ
index f0b81df..1a7ea4f 100644
--- a/edxapp/config/templates/lms.env.json.templ
+++ b/edxapp/config/templates/lms.env.json.templ
@@ -16,6 +16,7 @@
   "CELERY_BROKER_TRANSPORT": "amqp",
   "MEDIA_ROOT": "/openedx/data/uploads/",
   "STATIC_ROOT_BASE": "/openedx/data/staticfiles",
+  "EMAIL_BACKEND": "django.core.mail.backends.smtp.EmailBackend",
   "EMAIL_HOST": "smtp",
   "EMAIL_PORT": 9025,
   "CACHES": {