diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 7ee5171a177fb0481ec68226678a9739b5baba92..13624511c21b2c681cf233d49cdd93903bd9917d 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 172395990630237f06c4d08b44ca84d67326e01a..37416216b597a1dd54253e09e349759ec0b04dea 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 a47bd477acd517652a9b135b7a072cda013d4a28..419bb0dd8975b09df4545d9ec6be4d69c24a2c32 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 {