Fix #186: moved high-level settings to database preferences

This commit is contained in:
Eliot Berriot 2018-04-28 06:24:44 +02:00
parent a3b2125d2a
commit 7ad21b7d25
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
5 changed files with 29 additions and 5 deletions

View File

@ -1,4 +1,3 @@
API_AUTHENTICATION_REQUIRED=True
RAVEN_ENABLED=false RAVEN_ENABLED=false
RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5 RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f716@sentry.eliotberriot.com/5
DJANGO_ALLOWED_HOSTS=.funkwhale.test,localhost,nginx,0.0.0.0,127.0.0.1 DJANGO_ALLOWED_HOSTS=.funkwhale.test,localhost,nginx,0.0.0.0,127.0.0.1

View File

@ -13,7 +13,7 @@ def test_list_permission_no_protect(anonymous_user, api_request, settings):
def test_list_permission_protect_anonymous( def test_list_permission_protect_anonymous(
anonymous_user, api_request, settings): db, anonymous_user, api_request, settings):
settings.PROTECT_AUDIO_FILES = True settings.PROTECT_AUDIO_FILES = True
view = APIView.as_view() view = APIView.as_view()
permission = permissions.Listen() permission = permissions.Listen()

View File

@ -0,0 +1,24 @@
Store high-level settings (such as federation or auth-related ones) in database (#186)
Changelog
^^^^^^^^^
Due to the work done in #186, the following environment variables have been
deprecated:
- FEDERATION_ENABLED
- FEDERATION_COLLECTION_PAGE_SIZE
- FEDERATION_MUSIC_NEEDS_APPROVAL
- FEDERATION_ACTOR_FETCH_DELAY
- PLAYLISTS_MAX_TRACKS
- API_AUTHENTICATION_REQUIRED
Configuration for this settings has been moved to database, as it will provide
a better user-experience, by allowing you to edit these values on-the-fly,
without restarting Funkwhale processes.
You can leave those environment variables in your .env file for now, as the
values will be used to populate the database entries. We'll make a proper
announcement when the variables won't be used anymore.
Please browse https://docs.funkwhale.audio/configuration.html#instance-settings
for more information about instance configuration using the web interface.

View File

@ -18,6 +18,8 @@ and technical aspects of your instance, such as database credentials.
on environment variables. on environment variables.
.. _instance-settings:
Instance settings Instance settings
----------------- -----------------

View File

@ -12,8 +12,7 @@ Managing federation
Federation management is only available to instance admins and users Federation management is only available to instance admins and users
who have the proper permissions. You can disable federation completely who have the proper permissions. You can disable federation completely
at the instance level by setting the FEDERATION_ENABLED environment variable at the instance level by editing the ``federation__enabled`` :ref:`setting <instance-settings>`.
to False.
On the front end, assuming you have the proper permission, you will see On the front end, assuming you have the proper permission, you will see
a "Federation" link in the sidebar. a "Federation" link in the sidebar.
@ -52,6 +51,6 @@ each other instance asking for access to library. This is by design,
to ensure your library is not shared publicly without your consent. to ensure your library is not shared publicly without your consent.
However, if you're confident about federating publicly without manual approval, However, if you're confident about federating publicly without manual approval,
you can set the FEDERATION_MUSIC_NEEDS_APPROVAL environment variable to false. you can set the ``federation__music_needs_approval`` :ref:`setting <instance-settings>` to false.
Follow requests will be accepted automatically and followers Follow requests will be accepted automatically and followers
given access to your library without manual intervention. given access to your library without manual intervention.