Commit f8e7155e authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch '580-dev' into 'develop'

Use port variables instead of hardcoded port (Backport of !580)

See merge request !1155
parents 7e29967b ba24a96e
......@@ -338,15 +338,15 @@ server {
<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='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:443 ssl;
listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='https_port'> ssl;
</tmpl_if>
ssl_certificate <tmpl_var name='ssl_crt_file'>;
ssl_certificate_key <tmpl_var name='ssl_key_file'>;
......
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