Commit 3db98ba4 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6180-ipv6-wildcard-config-missing-in-redirect-server-section' into 'develop'

Resolve "IPv6 wildcard config missing in redirect server section"

Closes #6180

See merge request !1489
parents ccd5cc89 4946eca1
Pipeline #9215 passed with stage
in 13 seconds
...@@ -355,11 +355,18 @@ server { ...@@ -355,11 +355,18 @@ server {
<tmpl_if name='ipv6_enabled'> <tmpl_if name='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='http_port'>; listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='http_port'>;
</tmpl_if> </tmpl_if>
<tmpl_if name='ipv6_wildcard'>
listen [::]:<tmpl_var name='http_port'>;
<tmpl_if name='ssl_enabled'> <tmpl_if name='ssl_enabled'>
listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl; listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl http2;
<tmpl_if name='ipv6_enabled'> <tmpl_if name='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='https_port'> ssl; listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='https_port'> ssl http2;
<tmpl_if name='ipv6_wildcard'>
listen [::]:<tmpl_var name='https_port'> ssl http2;
</tmpl_if> </tmpl_if>
ssl_certificate <tmpl_var name='ssl_crt_file'>; ssl_certificate <tmpl_var name='ssl_crt_file'>;
ssl_certificate_key <tmpl_var name='ssl_key_file'>; ssl_certificate_key <tmpl_var name='ssl_key_file'>;
Supports Markdown
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