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

Merge branch 'jd-improve-inplace-docs' into 'develop' 

Improve doc about in-place imports setup

Closes #298

See merge request funkwhale/funkwhale!249
This commit is contained in:
Eliot Berriot 2018-06-13 14:05:48 +00:00
parent e3f3a9b644 4e9aa16d05
commit 232d9ca86e
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/298.doc Normal file
View File

@ -0,0 +1 @@
Improved documentation about in-place imports setup (#298)

2
deploy/apache.conf
View File

@ -38,7 +38,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
# lines and move the configuration to the previous server block if you # lines and move the configuration to the previous server block if you
# don't want to run funkwhale behind https (this is not recommanded) # don't want to run funkwhale behind https (this is not recommanded)
# have a look here for let's encrypt configuration: # have a look here for let's encrypt configuration:
# https://certbot.eff.org/all-instructions/#debian-9-stretch-nginx # https://certbot.eff.org/lets-encrypt/debianstretch-apache.html
SSLEngine on SSLEngine on
SSLProxyEngine On SSLProxyEngine On
SSLCertificateFile /etc/letsencrypt/live/${funkwhale-sn}/fullchain.pem SSLCertificateFile /etc/letsencrypt/live/${funkwhale-sn}/fullchain.pem

2
deploy/env.prod.sample
View File

@ -113,4 +113,4 @@ RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f
# You can safely leave those settings uncommented if you don't plan to use # You can safely leave those settings uncommented if you don't plan to use
# in place imports. # in place imports.
# MUSIC_DIRECTORY_PATH= # MUSIC_DIRECTORY_PATH=
# MUSIC_DIRECTORY_SERVE_PATH= # MUSIC_DIRECTORY_SERVE_PATH= # docker-only

9
deploy/nginx.conf
View File

@ -79,18 +79,11 @@ server {
alias /srv/funkwhale/data/media/; alias /srv/funkwhale/data/media/;
} }
location /_protected/media {
# this is an internal location that is used to serve
# audio files once correct permission / authentication
# has been checked on API side
internal;
alias /srv/funkwhale/data/media;
}
location /_protected/music { location /_protected/music {
# this is an internal location that is used to serve # this is an internal location that is used to serve
# audio files once correct permission / authentication # audio files once correct permission / authentication
# has been checked on API side # has been checked on API side
# Set this to the same value as your MUSIC_DIRECTORY_PATH setting
internal; internal;
alias /srv/funkwhale/data/music; alias /srv/funkwhale/data/music;
} }

6
docs/configuration.rst
View File

@ -97,6 +97,12 @@ for this value. For non-docker installation, you can use any absolute path.
.. note:: This path should not include any trailing slash .. note:: This path should not include any trailing slash
.. warning::
You need to adapt your :ref:`reverse-proxy configuration<reverse-proxy-setup>` to
serve the directory pointed by ``MUSIC_DIRECTORY_PATH`` on
``/_protected/music`` URL.
.. _setting-MUSIC_DIRECTORY_SERVE_PATH: .. _setting-MUSIC_DIRECTORY_SERVE_PATH:
``MUSIC_DIRECTORY_SERVE_PATH`` ``MUSIC_DIRECTORY_SERVE_PATH``