Commit 89cb553e authored by Ramil Valitov's avatar Ramil Valitov

fix nginx redirects section

parent a754d548
......@@ -310,18 +310,19 @@ location ~ /\.well-known/acme-challenge/ {
<tmpl_loop name="redirects">
server {
listen <tmpl_var name='ip_address'>:80;
listen <tmpl_var name='ip_address'>:<tmpl_var name='http_port'>;
<tmpl_if name='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:80;
listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='http_port'>;
</tmpl_if>
<tmpl_if name='ssl_enabled'>
listen <tmpl_var name='ip_address'>:443 ssl;
listen <tmpl_var name='ip_address'>:<tmpl_var name='https_port'> ssl{tmpl_if name='enable_http2' op='==' value='y'} http2{/tmpl_if}{tmpl_if name='enable_spdy' op='==' value='y'} spdy{/tmpl_if};
ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
<tmpl_if name='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:443 ssl;
listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='https_port'> ssl{tmpl_if name='enable_http2' op='==' value='y'} http2{/tmpl_if}{tmpl_if name='enable_spdy' op='==' value='y'} spdy{/tmpl_if};
</tmpl_if>
ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
ssl_certificate <tmpl_var name='ssl_crt_file'>;
ssl_certificate_key <tmpl_var name='ssl_key_file'>;
</tmpl_if>
server_name <tmpl_var name='rewrite_domain'>;
......
  • When will this fix be released in the 3.1.x branch? This issue is hitting me on a lot of customer pages. I'm running 3.1.2 and for the time beeing I created a custom config with this changes and the other one with optimised SSL redirect, but this is fairly old and not included in the May update to 3.1.3. Why?

  • mentioned in issue #4656 (closed)

    Toggle commit list
  • The master branch is for new features only that shall go into the 3.2 release, it is not for bugfixes as no code from 3.2 will get backported to 3.1 while all bugfixes from 3.1 will get merged to 3.2 automatically. So bugfixes have always be submitted against the stable branch if they shall be included into a 3.1.x release.

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