christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-11-16 10:05:18 +00:00
Code Issues Releases Activity

Factor out common logic for lms/{production/development}.py

Browse Source
This commit is contained in:
Silvio Tomatis 2019-04-24 15:40:35 +02:00 committed by Régis Behmo
parent 555845474d
commit cb9d342196
3 changed files with 48 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tutor/templates/apps/openedx/settings/lms/common.py Normal file
View File

@ -0,0 +1,44 @@
"""File with configurations for lms common between production and development.
"""
# 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',
}
# Fix media files paths
VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
PROFILE_IMAGE_BACKEND['options']['location'] = os.path.join(MEDIA_ROOT, 'profile-images/')
ORA2_FILEUPLOAD_BACKEND = 'filesystem'
ORA2_FILEUPLOAD_ROOT = '/openedx/data/ora2'
ORA2_FILEUPLOAD_CACHE_NAME = 'ora2-storage'
GRADES_DOWNLOAD = {
'STORAGE_TYPE': '',
'STORAGE_KWARGS': {
'base_url': "/media/grades/",
'location': os.path.join(MEDIA_ROOT, 'grades'),
}
}
LOCALE_PATHS.append('/openedx/locale')
# Create folders if necessary
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
if not os.path.exists(folder):
os.makedirs(folder)

41
tutor/templates/apps/openedx/settings/lms/development.py
View File

@ -1,47 +1,10 @@
import os import os
from lms.envs.devstack import * from lms.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 # Execute the contents of common.py in this context
MEDIA_ROOT = "/openedx/data/uploads/" execfile(os.path.join(os.path.dirname(__file__), 'common.py'), globals())
# 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',
}
# Fix media files paths
VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
PROFILE_IMAGE_BACKEND['options']['location'] = os.path.join(MEDIA_ROOT, 'profile-images/')
ORA2_FILEUPLOAD_BACKEND = 'filesystem'
ORA2_FILEUPLOAD_ROOT = '/openedx/data/ora2'
ORA2_FILEUPLOAD_CACHE_NAME = 'ora2-storage'
GRADES_DOWNLOAD = {
'STORAGE_TYPE': '',
'STORAGE_KWARGS': {
'base_url': "/media/grades/",
'location': os.path.join(MEDIA_ROOT, 'grades'),
}
}
LOCALE_PATHS.append('/openedx/locale')
# Setup correct webpack configuration file for development # Setup correct webpack configuration file for development
WEBPACK_CONFIG_PATH = 'webpack.dev.config.js' WEBPACK_CONFIG_PATH = 'webpack.dev.config.js'
# Create folders if necessary
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
if not os.path.exists(folder):
os.makedirs(folder)

42
tutor/templates/apps/openedx/settings/lms/production.py
View File

@ -1,28 +1,9 @@
import os import os
from lms.envs.production import * from lms.envs.production import *
# Load module store settings from config files
update_module_store_settings(MODULESTORE, doc_store_settings=DOC_STORE_CONFIG)
# Set uploaded media file path # Execute the contents of common.py in this context
MEDIA_ROOT = "/openedx/data/uploads/" execfile(os.path.join(os.path.dirname(__file__), 'common.py'), globals())
# 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',
}
# Fix media files paths
VIDEO_IMAGE_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
VIDEO_TRANSCRIPTS_SETTINGS['STORAGE_KWARGS']['location'] = MEDIA_ROOT
PROFILE_IMAGE_BACKEND['options']['location'] = os.path.join(MEDIA_ROOT, 'profile-images/')
ALLOWED_HOSTS = [ ALLOWED_HOSTS = [
ENV_TOKENS.get('LMS_BASE'), ENV_TOKENS.get('LMS_BASE'),
@ -49,22 +30,3 @@ PAYMENT_SUPPORT_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
BULK_EMAIL_DEFAULT_FROM_EMAIL = 'no-reply@' + ENV_TOKENS['LMS_BASE'] BULK_EMAIL_DEFAULT_FROM_EMAIL = 'no-reply@' + ENV_TOKENS['LMS_BASE']
API_ACCESS_MANAGER_EMAIL = ENV_TOKENS['CONTACT_EMAIL'] API_ACCESS_MANAGER_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
API_ACCESS_FROM_EMAIL = ENV_TOKENS['CONTACT_EMAIL'] API_ACCESS_FROM_EMAIL = ENV_TOKENS['CONTACT_EMAIL']
ORA2_FILEUPLOAD_BACKEND = 'filesystem'
ORA2_FILEUPLOAD_ROOT = '/openedx/data/ora2'
ORA2_FILEUPLOAD_CACHE_NAME = 'ora2-storage'
GRADES_DOWNLOAD = {
'STORAGE_TYPE': '',
'STORAGE_KWARGS': {
'base_url': "/media/grades/",
'location': os.path.join(MEDIA_ROOT, 'grades'),
}
}
LOCALE_PATHS.append('/openedx/locale')
# Create folders if necessary
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
if not os.path.exists(folder):
os.makedirs(folder)