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

Merge branch 'patch-1' into 'develop' 

Fix typo

See merge request funkwhale/funkwhale!409
This commit is contained in:
Eliot Berriot 2018-09-13 15:31:06 +00:00
parent 8af459ff43 7394ae1960
commit 58ddf5f5ef
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changes/changelog.d/358.enhancement
View File

@ -86,7 +86,7 @@ Update the funkwhale.conf configuration of your server's reverse-proxy::
sudo nano /etc/nginx/sites-enabled/funkwhale.conf
upstream fw {
# depending on your setup, you may want to udpate this
# depending on your setup, you may want to update this
server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
}
map $http_upgrade $connection_upgrade {

2
deploy/docker.nginx.template
View File

@ -1,5 +1,5 @@
upstream funkwhale-api {
# depending on your setup, you may want to udpate this
# depending on your setup, you may want to update this
server api:5000;
}

2
deploy/docker.proxy.template
View File

@ -1,5 +1,5 @@
upstream fw {
# depending on your setup, you may want to udpate this
# depending on your setup, you may want to update this
server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
}
map $http_upgrade $connection_upgrade {

2
deploy/env.prod.sample
View File

@ -51,7 +51,7 @@ FUNKWHALE_PROTOCOL=https
# EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465
# EMAIL_CONFIG=smtp+tls://user@:password@youremail.host:587
# The email address to use to send systme emails. By default, we will
# The email address to use to send system emails.
# DEFAULT_FROM_EMAIL=noreply@yourdomain
# Depending on the reverse proxy used in front of your funkwhale instance,

2
deploy/nginx.template
View File

@ -1,7 +1,7 @@
# This file was generated from funkwhale.template
upstream funkwhale-api {
# depending on your setup, you may want to udpate this
# depending on your setup, you may want to update this
server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
}