From ce1bb05d8edd04e9332c0e17085efd2ad2150494 Mon Sep 17 00:00:00 2001
From: Silvio Tomatis <silviot@gmail.com>
Date: Wed, 24 Apr 2019 15:47:26 +0200
Subject: [PATCH] Factor out common logic for cms/{production/development}.py

---
 .../apps/openedx/settings/cms/common.py       | 24 ++++++++++++++++++
 .../apps/openedx/settings/cms/development.py  | 25 ++-----------------
 .../apps/openedx/settings/cms/production.py   | 23 ++---------------
 3 files changed, 28 insertions(+), 44 deletions(-)
 create mode 100644 tutor/templates/apps/openedx/settings/cms/common.py

diff --git a/tutor/templates/apps/openedx/settings/cms/common.py b/tutor/templates/apps/openedx/settings/cms/common.py
new file mode 100644
index 0000000..40aca99
--- /dev/null
+++ b/tutor/templates/apps/openedx/settings/cms/common.py
@@ -0,0 +1,24 @@
+# Load module store settings from config files
+update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
+
+# Set uploaded media file path
+MEDIA_ROOT = "/openedx/data/uploads/"
+
+# Video settings
+VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
+VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
+
+# Change syslog-based loggers which don't work inside docker containers
+LOGGING['handlers']['local'] = {'class': 'logging.NullHandler'}
+LOGGING['handlers']['tracking'] = {
+    'level': 'DEBUG',
+    'class': 'logging.StreamHandler',
+    'formatter': 'standard',
+}
+
+LOCALE_PATHS.append('/openedx/locale')
+
+# Create folders if necessary
+for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
+    if not os.path.exists(folder):
+        os.makedirs(folder)
diff --git a/tutor/templates/apps/openedx/settings/cms/development.py b/tutor/templates/apps/openedx/settings/cms/development.py
index 3aecee9..3af4712 100644
--- a/tutor/templates/apps/openedx/settings/cms/development.py
+++ b/tutor/templates/apps/openedx/settings/cms/development.py
@@ -1,30 +1,9 @@
 import os
 from cms.envs.devstack import *
 
-# Load module store settings from config files
-update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
 
-# Set uploaded media file path
-MEDIA_ROOT = "/openedx/data/uploads/"
-
-# Video settings
-VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
-VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
-
-# Change syslog-based loggers which don't work inside docker containers
-LOGGING['handlers']['local'] = {'class': 'logging.NullHandler'}
-LOGGING['handlers']['tracking'] = {
-    'level': 'DEBUG',
-    'class': 'logging.StreamHandler',
-    'formatter': 'standard',
-}
-
-LOCALE_PATHS.append('/openedx/locale')
+# Execute the contents of common.py in this context
+execfile(os.path.join(os.path.dirname(__file__), 'common.py'), globals())
 
 # Setup correct webpack configuration file for development
 WEBPACK_CONFIG_PATH = 'webpack.dev.config.js'
-
-# Create folders if necessary
-for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
-    if not os.path.exists(folder):
-        os.makedirs(folder)
diff --git a/tutor/templates/apps/openedx/settings/cms/production.py b/tutor/templates/apps/openedx/settings/cms/production.py
index fdf4d73..049e83a 100644
--- a/tutor/templates/apps/openedx/settings/cms/production.py
+++ b/tutor/templates/apps/openedx/settings/cms/production.py
@@ -1,21 +1,9 @@
 import os
 from cms.envs.production import *
 
-update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
 
-MEDIA_ROOT = "/openedx/data/uploads/"
-
-# Video settings
-VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
-VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
-
-# Change syslog-based loggers which don't work inside docker containers
-LOGGING['handlers']['local'] = {'class': 'logging.NullHandler'}
-LOGGING['handlers']['tracking'] = {
-    'level': 'DEBUG',
-    'class': 'logging.StreamHandler',
-    'formatter': 'standard',
-}
+# Execute the contents of common.py in this context
+execfile(os.path.join(os.path.dirname(__file__), 'common.py'), globals())
 
 ALLOWED_HOSTS = [
     ENV_TOKENS.get('CMS_BASE'),
@@ -27,10 +15,3 @@ ALLOWED_HOSTS = [
 DEFAULT_FROM_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
 DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
 SERVER_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
-
-LOCALE_PATHS.append('/openedx/locale')
-
-# Create folders if necessary
-for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
-    if not os.path.exists(folder):
-        os.makedirs(folder)