bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

settings etherpad exturl fix

Browse Source
This commit is contained in:
Andreas Stephanides
2021-02-08 17:31:47 +00:00
parent 3ac6bade0e
commit 77718d8f71
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fet2020/fet2020/settings.py
View File

@@ -12,7 +12,7 @@ env = environ.Env(
MYSQL_PASSWORD=(str), MYSQL_PASSWORD=(str),
HOST_NAME=(str, "localhost"), HOST_NAME=(str, "localhost"),
ETHERPAD_PORT=(str, "9001"), ETHERPAD_PORT=(str, "9001"),
ETHERPAD_HOST=(str, "etherpad2.2020.fet.at"), ETHERPAD_HOST=(str, ""),
) )
# Prints and logs are written to console # Prints and logs are written to console
@@ -217,12 +217,16 @@ THUMBNAIL_ALIASES = {
"portrait": {"size": (200, 300), "crop": False}, "portrait": {"size": (200, 300), "crop": False},
}, },
} }
ETHERPAD_HOST = env("ETHERPAD_HOST").strip()
if not ETHERPAD_HOST or ETHERPAD_HOST=="":
ETHERPAD_HOST = urljoin("https://" + env("HOST_NAME"), "etherpad/")
# ETHERPAD CLIENT # ETHERPAD CLIENT
if DEBUG: if DEBUG:
ETHERPAD_CLIENT = { ETHERPAD_CLIENT = {
"url": "http://etherpad:" + env("ETHERPAD_PORT"), "url": "http://etherpad:" + env("ETHERPAD_PORT"),
"exturl": env("ETHERPAD_HOST"), "exturl": ETHERPAD_HOST,
"apikey": "/srv/etherpad/APIKEY.txt", "apikey": "/srv/etherpad/APIKEY.txt",
} }
else: else: