Skip to content

Commit 3b3762f

Browse files
committed
adjusted Nginx TLS 1.3 naming and switched to true if TLS 1.3 is supported
1 parent d07b2ad commit 3b3762f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

server/conf/nginx_vhost.conf.master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ server {
1919
</tmpl_if>
2020
</tmpl_if>
2121

22-
<tmpl_if name='tls13_available' op='>=' value='1.1.1' format='version'>
22+
<tmpl_if name='tls1.3_supported' op='==' value='y'>
2323
<tmpl_var name="ssl_protocols">
2424
ssl_protocols TLSv1.3 TLSv1.2;
2525
<tmpl_else>

server/plugins-available/nginx_plugin.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ function update($event_name, $data) {
16211621
// set logging variable
16221622
$vhost_data['logging'] = $web_config['logging'];
16231623

1624-
// Provide TLS 1.3 support if Nginx is >= 1.13.0 and when it was linked against OpenSSL(>=1.1.1) at build time.
1624+
// Provide TLS 1.3 support if Nginx version is >= 1.13.0 and when it was linked against OpenSSL(>=1.1.1) at build time.
16251625
$output = $app->system->exec_safe('nginx -V 2>&1');
16261626

16271627
if(preg_match('/built with OpenSSL\s*(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) {
@@ -1630,7 +1630,7 @@ function update($event_name, $data) {
16301630

16311631
if((version_compare($app->system->getnginxversion(true), '1.13.0', '>=') && version_compare($nginx_openssl_ver, '1.1.1', '>='))) {
16321632
$app->log('Enable TLS 1.3 for: '.$domain, LOGLEVEL_DEBUG);
1633-
$vhost_data['tls13_available'] = $nginx_openssl_ver;
1633+
$vhost_data['tls1.3_supported'] = 'y';
16341634
}
16351635

16361636
$tpl->setVar($vhost_data);

0 commit comments

Comments
 (0)