Updated documentation with apache2 reverse-proxy instructions

This commit is contained in:
Eliot Berriot 2018-04-28 14:25:20 +02:00
commit 24425ea529
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
3 changed files with 57 additions and 23 deletions

View file

@ -1,14 +1,18 @@
# Following variables should be modified according to your setup
Define funkwhale-api http://192.168.1.199:5000
Define funkwhale-api-ws ws://192.168.1.199:5000
Define funkwhale-sn funkwhale.duckdns.org
Define MUSIC_DIRECTORY_PATH /music/directory/path
# Following variables MUST be modified according to your setup
Define funkwhale-sn funkwhale.yourdomain.com
# Following variables should be modified according to your setup and if you
# use different configuration than what is described in our installation guide.
Define funkwhale-api http://localhost:5000
Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
# websockets are not working yet
# Define funkwhale-api-ws ws://localhost:5000
# HTTP request redirected to HTTPS
<VirtualHost *:80>
ServerName ${funkwhale-sn}
# Default is to force https
RewriteEngine on
RewriteCond %{SERVER_NAME} =${funkwhale-sn}
@ -26,7 +30,7 @@ Define MUSIC_DIRECTORY_PATH /music/directory/path
<VirtualHost *:443>
ServerName ${funkwhale-sn}
# Path to ErrorLog and access log
# Path to ErrorLog and access log
ErrorLog ${APACHE_LOG_DIR}/funkwhale/error.log
CustomLog ${APACHE_LOG_DIR}/funkwhale/access.log combined
@ -56,26 +60,21 @@ Define MUSIC_DIRECTORY_PATH /music/directory/path
</IfModule>
# Turning ProxyRequests on and allowing proxying from all may allow
# spammers to use your proxy to send email.
# spammers to use your proxy to send email.
ProxyRequests Off
<Proxy *>
<Proxy *>
AddDefaultCharset off
Order Allow,Deny
Allow from all
# Here you can set a password using htpasswd to protect your proxy server
#Authtype Basic
#Authname "Password Required"
#AuthUserFile /etc/apache2/.htpasswd
#Require valid-user
</Proxy>
# Activating WebSockets (not working)
ProxyPass "/api/v1/instance/activity" "ws://192.168.1.199:5000/api/v1/instance/activity"
# ProxyPass "/api/v1/instance/activity" "ws://localhost:5000/api/v1/instance/activity"
<Location "/api">
# similar to nginx 'client_max_body_size 30M;'
LimitRequestBody 31457280
LimitRequestBody 31457280
ProxyPass ${funkwhale-api}/api
ProxyPassReverse ${funkwhale-api}/api
@ -84,7 +83,7 @@ Define MUSIC_DIRECTORY_PATH /music/directory/path
ProxyPass ${funkwhale-api}/federation
ProxyPassReverse ${funkwhale-api}/federation
</Location>
<Location "/.well-known/webfinger">
ProxyPass ${funkwhale-api}/.well-known/webfinger
ProxyPassReverse ${funkwhale-api}/.well-known/webfinger
@ -95,9 +94,9 @@ Define MUSIC_DIRECTORY_PATH /music/directory/path
Alias /staticfiles /srv/funkwhale/data/static
# Setting appropriate access levels to serve frontend
<Directory "/srv/funkwhale/data/static">
<Directory "/srv/funkwhale/data/static">
Options FollowSymLinks
AllowOverride None
AllowOverride None
Require all granted
</Directory>
@ -114,7 +113,7 @@ Define MUSIC_DIRECTORY_PATH /music/directory/path
#LoadModule xsendfile_module modules/mod_xsendfile.so
<IfModule mod_xsendfile.c>
XSendFile On
XSendFilePath /srv/funkwhale/data/media
XSendFilePath /srv/funkwhale/data/media
XSendFilePath ${MUSIC_DIRECTORY_PATH}
SetEnv MOD_X_SENDFILE_ENABLED 1
</IfModule>