Merge branch 'fix-mixed-content' into 'master'

Always set X-Forwarded-Proto to avoid mixed content warnings

See merge request !12

templates/funkwhale_proxy.conf.j2

@@ -2,8 +2,8 @@
 proxy_set_header Host $host;
 proxy_set_header X-Real-IP $remote_addr;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-{% if not funkwhale_nginx_tls_termination -%}
 proxy_set_header X-Forwarded-Proto $scheme;
+{% if not funkwhale_nginx_tls_termination -%}
 proxy_set_header X-Forwarded-Host $host:$server_port;
 proxy_set_header X-Forwarded-Port $server_port;
 proxy_redirect off;