MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some issues

This commit is contained in:
Eliot Berriot 2019-04-24 12:56:15 +02:00
parent 101ae27885
commit 6135d427e7
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/config/settings/common.py
View File

@ -308,15 +308,6 @@ DEFAULT_FILE_STORAGE = "funkwhale_api.common.storage.ASCIIFileSystemStorage"
AWS_DEFAULT_ACL = None AWS_DEFAULT_ACL = None
AWS_QUERYSTRING_AUTH = False 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) AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID", default=None)

1
api/funkwhale_api/music/views.py
View File

@ -241,7 +241,6 @@ def get_file_path(audio_file):
) )
path = "/music" + audio_file.replace(prefix, "", 1) path = "/music" + audio_file.replace(prefix, "", 1)
if path.startswith("http://") or path.startswith("https://"): if path.startswith("http://") or path.startswith("https://"):
raise
return (settings.PROTECT_FILES_PATH + "/media/" + path).encode("utf-8") return (settings.PROTECT_FILES_PATH + "/media/" + path).encode("utf-8")
return (settings.PROTECT_FILES_PATH + path).encode("utf-8") return (settings.PROTECT_FILES_PATH + path).encode("utf-8")
if t == "apache2": if t == "apache2":

1
docker/nginx/conf.dev
View File

@ -107,6 +107,7 @@ http {
# internal; # internal;
# resolver 127.0.0.11; # resolver 127.0.0.11;
# proxy_pass $1; # proxy_pass $1;
# add_header X-Remote-URL "$1";
# } # }
location /_protected/music { location /_protected/music {