Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup some settings.

Browse Source
This commit is contained in:
Usman Khalid
2015-11-20 18:18:32 +05:00
parent 6a76db085f
commit dc7b57f459
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/aws.py
View File

@@ -269,6 +269,8 @@ else:
DATABASES = AUTH_TOKENS['DATABASES'] DATABASES = AUTH_TOKENS['DATABASES']
# Enable automatic transaction management on all databases # Enable automatic transaction management on all databases
# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests
# This needs to be true for all databases
for database_name in DATABASES: for database_name in DATABASES:
DATABASES[database_name]['ATOMIC_REQUESTS'] = True DATABASES[database_name]['ATOMIC_REQUESTS'] = True

2
cms/envs/common.py
View File

@@ -62,7 +62,7 @@ from xmodule.mixin import LicenseMixin
# Dummy secret key for dev/test # Dummy secret key for dev/test
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' SECRET_KEY = 'dev key'
STUDIO_NAME = "Studio" STUDIO_NAME = "Studio"
STUDIO_SHORT_NAME = "Studio" STUDIO_SHORT_NAME = "Studio"

8
lms/envs/aws.py
View File

@@ -165,7 +165,7 @@ REGISTRATION_EXTRA_FIELDS = ENV_TOKENS.get('REGISTRATION_EXTRA_FIELDS', REGISTRA
EDXMKTG_LOGGED_IN_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_LOGGED_IN_COOKIE_NAME', EDXMKTG_LOGGED_IN_COOKIE_NAME) EDXMKTG_LOGGED_IN_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_LOGGED_IN_COOKIE_NAME', EDXMKTG_LOGGED_IN_COOKIE_NAME)
EDXMKTG_USER_INFO_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_USER_INFO_COOKIE_NAME', EDXMKTG_USER_INFO_COOKIE_NAME) EDXMKTG_USER_INFO_COOKIE_NAME = ENV_TOKENS.get('EDXMKTG_USER_INFO_COOKIE_NAME', EDXMKTG_USER_INFO_COOKIE_NAME)
ENV_FEATURES = ENV_TOKENS.get('FEATURES', ENV_TOKENS.get('MITX_FEATURES', {})) ENV_FEATURES = ENV_TOKENS.get('FEATURES', {})
for feature, value in ENV_FEATURES.items(): for feature, value in ENV_FEATURES.items():
FEATURES[feature] = value FEATURES[feature] = value
@@ -259,10 +259,6 @@ USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N)
for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []): for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []):
INSTALLED_APPS += (app,) INSTALLED_APPS += (app,)
ENV_FEATURES = ENV_TOKENS.get('FEATURES', {})
for feature, value in ENV_FEATURES.items():
FEATURES[feature] = value
WIKI_ENABLED = ENV_TOKENS.get('WIKI_ENABLED', WIKI_ENABLED) WIKI_ENABLED = ENV_TOKENS.get('WIKI_ENABLED', WIKI_ENABLED)
local_loglevel = ENV_TOKENS.get('LOCAL_LOGLEVEL', 'INFO') local_loglevel = ENV_TOKENS.get('LOCAL_LOGLEVEL', 'INFO')
@@ -438,6 +434,8 @@ FILE_UPLOAD_STORAGE_PREFIX = ENV_TOKENS.get('FILE_UPLOAD_STORAGE_PREFIX', FILE_U
DATABASES = AUTH_TOKENS['DATABASES'] DATABASES = AUTH_TOKENS['DATABASES']
# Enable automatic transaction management on all databases # Enable automatic transaction management on all databases
# https://docs.djangoproject.com/en/1.8/topics/db/transactions/#tying-transactions-to-http-requests
# This needs to be true for all databases
for database_name in DATABASES: for database_name in DATABASES:
DATABASES[database_name]['ATOMIC_REQUESTS'] = True DATABASES[database_name]['ATOMIC_REQUESTS'] = True

2
lms/envs/common.py
View File

@@ -2676,7 +2676,7 @@ CREDIT_TASK_DEFAULT_RETRY_DELAY = 30
CREDIT_TASK_MAX_RETRIES = 5 CREDIT_TASK_MAX_RETRIES = 5
# Dummy secret key for dev/test # Dummy secret key for dev/test
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' SECRET_KEY = 'dev key'
# Secret keys shared with credit providers. # Secret keys shared with credit providers.
# Used to digitally sign credit requests (us --> provider) # Used to digitally sign credit requests (us --> provider)

2
lms/envs/test_with_mysql.py
View File

@@ -5,7 +5,7 @@ from .test import * # pylint: disable=wildcard-import
from .aws import * # pylint: disable=wildcard-import from .aws import * # pylint: disable=wildcard-import
# Dummy secret key for dev # Dummy secret key for dev
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' SECRET_KEY = 'dev key'
INSTALLED_APPS = ( INSTALLED_APPS = (
'django.contrib.auth', 'django.contrib.auth',