arno/etesync-server
1
0
Fork 0
mirror of https://github.com/etesync/server synced 2024-12-27 09:48:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #147 from Xiretza/settings-env-override

Browse Source 
fix(settings): ensure environment variables always override config
This commit is contained in:
Tom Hacohen 2024-06-02 21:13:14 -04:00 committed by GitHub
commit 62152ce52b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etebase_server/settings.py
View File

@ -126,13 +126,12 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.0/howto/static-files/
STATIC_ROOT = os.path.join(BASE_DIR, "static")
STATIC_URL = "/static/"
STATIC_ROOT = os.environ.get("DJANGO_STATIC_ROOT", os.path.join(BASE_DIR, "static"))
MEDIA_ROOT = os.environ.get("DJANGO_MEDIA_ROOT", os.path.join(BASE_DIR, "media"))
MEDIA_ROOT = os.path.join(BASE_DIR, "media")
MEDIA_URL = "/user-media/"
# Define where to find configuration files
config_locations = [
os.environ.get("ETEBASE_EASY_CONFIG_PATH", ""),
@ -193,6 +192,12 @@ if any(os.path.isfile(x) for x in config_locations):
SENDFILE_BACKEND = "etebase_server.fastapi.sendfile.backends.simple"
SENDFILE_ROOT = MEDIA_ROOT
if "DJANGO_STATIC_ROOT" in os.environ:
STATIC_ROOT = os.environ["DJANGO_STATIC_ROOT"]
if "DJANGO_MEDIA_ROOT" in os.environ:
MEDIA_ROOT = os.environ["DJANGO_MEDIA_ROOT"]
# Make an `etebase_server_settings` module available to override settings.
try:
from etebase_server_settings import *