fix: env content_delivery_type variable

This commit is contained in:
swve 2023-07-11 14:18:06 +01:00
parent 746c20d46c
commit 6d97aa2072
3 changed files with 3 additions and 6 deletions

View file

@ -128,9 +128,8 @@ def get_learnhouse_config() -> LearnHouseConfig:
cookie_config = CookieConfig(domain=cookies_domain)
env_content_delivery_type = os.environ.get("LEARNHOUSE_CONTENT_DELIVERY_TYPE")
content_delivery_type: str = (
content_delivery_type: str = env_content_delivery_type or (
(yaml_config.get("hosting_config", {}).get("content_delivery", {}).get("type"))
or env_content_delivery_type
or "filesystem"
) # default to filesystem

View file

@ -11,9 +11,6 @@ security:
hosting_config:
domain: learnhouse.app
ssl: true
allowed_origins:
- http://localhost:3000
- http://localhost:3001
cookies_config:
domain: ".localhost"
allowed_regexp: '\b((?:https?://)[^\s/$.?#].[^\s]*)\b'

View file

@ -30,6 +30,7 @@ async def upload_content(
elif content_delivery == "s3api":
# Upload to server then to s3 (AWS Keys are stored in environment variables and are loaded by boto3)
# TODO: Improve implementation of this
print("Uploading to s3...")
s3 = boto3.client(
"s3",
endpoint_url=learnhouse_config.hosting_config.content_delivery.s3api.endpoint_url,