mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-09-27 19:59:02 +00:00
Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
8d463941be
2
changelog.d/20231007_153252_fateme.khodayari97.md
Normal file
2
changelog.d/20231007_153252_fateme.khodayari97.md
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
- [Bugfix] Fix ORA2 file uploads in CMS. As the cache settings are shared between CMS and LMS, the settings are moved
|
||||||
|
from `common_lms.py` to `common_all.py`. (by @FatemeKhodayari)
|
@ -77,6 +77,11 @@ CACHES = {
|
|||||||
"BACKEND": "django_redis.cache.RedisCache",
|
"BACKEND": "django_redis.cache.RedisCache",
|
||||||
"LOCATION": "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}",
|
"LOCATION": "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}",
|
||||||
},
|
},
|
||||||
|
"ora2-storage": {
|
||||||
|
"KEY_PREFIX": "ora2-storage",
|
||||||
|
"BACKEND": "django_redis.cache.RedisCache",
|
||||||
|
"LOCATION": "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}",
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# The default Django contrib site is the one associated to the LMS domain name. 1 is
|
# The default Django contrib site is the one associated to the LMS domain name. 1 is
|
||||||
|
@ -21,7 +21,7 @@ FRONTEND_LOGIN_URL = LMS_ROOT_URL + '/login'
|
|||||||
FRONTEND_REGISTER_URL = LMS_ROOT_URL + '/register'
|
FRONTEND_REGISTER_URL = LMS_ROOT_URL + '/register'
|
||||||
|
|
||||||
# Create folders if necessary
|
# Create folders if necessary
|
||||||
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE]:
|
for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
|
||||||
if not os.path.exists(folder):
|
if not os.path.exists(folder):
|
||||||
os.makedirs(folder, exist_ok=True)
|
os.makedirs(folder, exist_ok=True)
|
||||||
|
|
||||||
|
@ -36,11 +36,6 @@ CACHES["staticfiles"] = {
|
|||||||
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
|
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
|
||||||
"LOCATION": "staticfiles_lms",
|
"LOCATION": "staticfiles_lms",
|
||||||
}
|
}
|
||||||
CACHES["ora2-storage"] = {
|
|
||||||
"KEY_PREFIX": "ora2-storage",
|
|
||||||
"BACKEND": "django_redis.cache.RedisCache",
|
|
||||||
"LOCATION": "redis://{% if REDIS_USERNAME and REDIS_PASSWORD %}{{ REDIS_USERNAME }}:{{ REDIS_PASSWORD }}{% endif %}@{{ REDIS_HOST }}:{{ REDIS_PORT }}/{{ OPENEDX_CACHE_REDIS_DB }}",
|
|
||||||
}
|
|
||||||
|
|
||||||
# Create folders if necessary
|
# Create folders if necessary
|
||||||
for folder in [DATA_DIR, LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
|
for folder in [DATA_DIR, LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]:
|
||||||
|
Loading…
Reference in New Issue
Block a user