diff options
| author | getzze | 2019-02-21 23:56:02 +0000 |
|---|---|---|
| committer | getzze | 2019-02-21 23:56:02 +0000 |
| commit | 1437585f544174d64166133162ddad60727cf63e (patch) | |
| tree | 77356cdbfa3cccd4d5507e46731b57e87327fcf5 /apache-funkwhale.conf | |
| parent | a21fbb5bd1313f3272b457551e1a445b68df50ce (diff) | |
| download | aur-1437585f544174d64166133162ddad60727cf63e.tar.gz | |
update to 0.18
Diffstat (limited to 'apache-funkwhale.conf')
| -rw-r--r-- | apache-funkwhale.conf | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/apache-funkwhale.conf b/apache-funkwhale.conf index 18a1cdf831fc..a0af46d970f2 100644 --- a/apache-funkwhale.conf +++ b/apache-funkwhale.conf @@ -5,11 +5,16 @@ Define funkwhale-sn funkwhale.local # use different configuration than what is described in our installation guide. Define funkwhale-api http://localhost:5000 Define funkwhale-api-ws ws://localhost:5000 -Define FRONTEND_PATH /usr/share/webapps/funkwhale/front/dist +Define FUNKWHALE_FRONTEND_PATH /usr/share/webapps/funkwhale/front/dist Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music +<IfModule mod_alias.c> + Alias /funkwhale ${FUNKWHALE_FRONTEND_PATH} +</IfModule> + + # HTTP requests redirected to HTTPS -<VirtualHost 127.0.0.2:80> +<VirtualHost *:80> ServerName ${funkwhale-sn} # Default is to force https @@ -25,8 +30,8 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music <IfModule mod_ssl.c> -<VirtualHost 127.0.0.2:443> - # Protocols h2 http/1.1 +<VirtualHost *:443> +# Protocols h2 http/1.1 ServerName ${funkwhale-sn} # Path to ErrorLog and access log @@ -50,7 +55,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music # Tell the api that the client is using https RequestHeader set X-Forwarded-Proto "https" - DocumentRoot ${FRONTEND_PATH} + DocumentRoot ${FUNKWHALE_FRONTEND_PATH} FallbackResource /index.html @@ -73,11 +78,11 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music </Proxy> # Activating WebSockets - ProxyPass "/api/v1/instance/activity" ${funkwhale-api-ws}/api/v1/instance/activity + ProxyPass "/api/v1/activity" ${funkwhale-api-ws}/api/v1/activity <Location "/api"> - # similar to nginx 'client_max_body_size 30M;' - LimitRequestBody 31457280 + # similar to nginx 'client_max_body_size 100M;' + LimitRequestBody 104857600 ProxyPass ${funkwhale-api}/api ProxyPassReverse ${funkwhale-api}/api @@ -99,6 +104,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music </Location> Alias /media /srv/funkwhale/data/media + Alias /front ${FUNKWHALE_FRONTEND_PATH} Alias /staticfiles /srv/funkwhale/data/static @@ -109,7 +115,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music Require all granted </Directory> - <Directory ${FRONTEND_PATH}> + <Directory ${FUNKWHALE_FRONTEND_PATH}> Options FollowSymLinks AllowOverride None Require all granted |