Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Webslice
ISPConfig 3
Commits
81d3cb1e
Commit
81d3cb1e
authored
Jul 05, 2019
by
Till Brehm
Browse files
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
parents
d712ea46
f76b5cf5
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/conf/nginx_vhost.conf.master
View file @
81d3cb1e
...
...
@@ -3,7 +3,9 @@ server {
<tmpl_if name='ipv6_enabled'>
listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='http_port'>;
</tmpl_if>
<tmpl_if name='ipv6_wildcard'>
listen [::]:<tmpl_var name='http_port'>;
</tmpl_if>
<tmpl_if name='ssl_enabled'>
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;
...
...
@@ -11,6 +13,9 @@ server {
# ssl_prefer_server_ciphers on;
<tmpl_if name='ipv6_enabled'>
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>
<tmpl_if name='ipv6_wildcard'>
listen [::]:<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='ssl_crt_file'>;
ssl_certificate_key <tmpl_var name='ssl_key_file'>;
...
...
server/plugins-available/nginx_plugin.inc.php
View file @
81d3cb1e
...
...
@@ -991,6 +991,7 @@ class nginx_plugin {
}
}
}
if
(
$data
[
'new'
][
'ip_address'
]
==
'*'
&&
$data
[
'new'
][
'ipv6_address'
]
==
''
)
$tpl
->
setVar
(
'ipv6_wildcard'
,
1
);
// PHP-FPM
// Support for multiple PHP versions
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment