yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 04:19:15 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Eliot Berriot 2019-06-28 10:38:52 +02:00
commit 8f261f96e9
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
26 changed files with 111 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/config/settings/common.py
View file

@ -706,3 +706,6 @@ RSA_KEY_SIZE = 2048
CREATE_IMAGE_THUMBNAILS = env.bool("CREATE_IMAGE_THUMBNAILS", default=True)
# we rotate actor keys at most every two days by default
ACTOR_KEY_ROTATION_DELAY = env.int("ACTOR_KEY_ROTATION_DELAY", default=3600 * 48)
SUBSONIC_DEFAULT_TRANSCODING_FORMAT = (
env("SUBSONIC_DEFAULT_TRANSCODING_FORMAT", default="mp3") or None
)