diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 7ee5171a1..13624511c 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -308,15 +308,6 @@ DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIFileSystemStorage" AWS_DEFAULT_ACL = None AWS_QUERYSTRING_AUTH = False -# MINIO_ACCESS_KEY_ID = env("MINIO_ACCESS_KEY_ID", default=None) - -# if MINIO_ACCESS_KEY_ID: -# AWS_ACCESS_KEY_ID = MINIO_ACCESS_KEY_ID -# AWS_SECRET_ACCESS_KEY = env("MINIO_SECRET_KEY") -# AWS_STORAGE_BUCKET_NAME = env("MINIO_STORAGE_BUCKET_NAME") -# AWS_S3_ENDPOINT_URL = env("MINIO_URL") -# AWS_LOCATION = env("MINIO_BUCKET_DIRECTORY", default="") -# DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage" AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID", default=None) diff --git a/api/funkwhale_api/music/views.py b/api/funkwhale_api/music/views.py index 172395990..37416216b 100644 --- a/api/funkwhale_api/music/views.py +++ b/api/funkwhale_api/music/views.py @@ -241,7 +241,6 @@ def get_file_path(audio_file): ) path = "/music" + audio_file.replace(prefix, "", 1) if path.startswith("http://") or path.startswith("https://"): - raise return (settings.PROTECT_FILES_PATH + "/media/" + path).encode("utf-8") return (settings.PROTECT_FILES_PATH + path).encode("utf-8") if t == "apache2": diff --git a/docker/nginx/conf.dev b/docker/nginx/conf.dev index a47bd477a..419bb0dd8 100644 --- a/docker/nginx/conf.dev +++ b/docker/nginx/conf.dev @@ -107,6 +107,7 @@ http { # internal; # resolver 127.0.0.11; # proxy_pass $1; + # add_header X-Remote-URL "$1"; # } location /_protected/music {