Commit 58ddf5f5 authored by Eliot Berriot's avatar Eliot Berriot 💬

Merge branch 'patch-1' into 'develop'

Fix typo

See merge request funkwhale/funkwhale!409
parents 8af459ff 7394ae19
...@@ -86,7 +86,7 @@ Update the funkwhale.conf configuration of your server's reverse-proxy:: ...@@ -86,7 +86,7 @@ Update the funkwhale.conf configuration of your server's reverse-proxy::
sudo nano /etc/nginx/sites-enabled/funkwhale.conf sudo nano /etc/nginx/sites-enabled/funkwhale.conf
upstream fw { 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}; server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
} }
map $http_upgrade $connection_upgrade { map $http_upgrade $connection_upgrade {
......
upstream funkwhale-api { 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; server api:5000;
} }
......
upstream fw { 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}; server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
} }
map $http_upgrade $connection_upgrade { map $http_upgrade $connection_upgrade {
......
...@@ -51,7 +51,7 @@ FUNKWHALE_PROTOCOL=https ...@@ -51,7 +51,7 @@ FUNKWHALE_PROTOCOL=https
# EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465 # EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465
# EMAIL_CONFIG=smtp+tls://user@:password@youremail.host:587 # 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 # DEFAULT_FROM_EMAIL=noreply@yourdomain
# Depending on the reverse proxy used in front of your funkwhale instance, # Depending on the reverse proxy used in front of your funkwhale instance,
......
# This file was generated from funkwhale.template # This file was generated from funkwhale.template
upstream funkwhale-api { 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}; server ${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT};
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment