Commit b08e97b9 authored by Agate's avatar Agate 💬

Merge branch 'master' into 'master'

Update nginx.conf.j2 based on https://governance.funkwhale.audio/d/0P4YcUp6/comment/1008

See merge request !3
parents 8c196d95 b3b5b651
Pipeline #8969 passed with stage
in 20 seconds
......@@ -15,8 +15,8 @@ map $http_upgrade $connection_upgrade {
}
server {
listen {% if funkwhale_protocol == 'https' %}443 ssl{% else %}80{% endif %} http2;
listen [::]:{% if funkwhale_protocol == 'https' %}443 ssl{% else -%}80{% endif %} http2;
listen {% if funkwhale_protocol == 'https' %}443 ssl http2{% else %}80{% endif %};
listen [::]:{% if funkwhale_protocol == 'https' %}443 ssl http2{% else -%}80{% endif %};
server_name {{ funkwhale_hostname }};
{% if funkwhale_protocol == 'https' -%}
{% if funkwhale_ssl_key_path -%}
......
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