Skip to content

Commit 8c993eb

Browse files
author
Till Brehm
committed
Fixeed #5262 Nginx ssl directive deprecated warning in ispconfig.vhost file
1 parent 3fa0164 commit 8c993eb

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎install/dist/lib/fedora.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,11 +1253,11 @@ public function install_ispconfig()
12531253
$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
12541254

12551255
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
1256-
$content = str_replace('{ssl_on}', ' on', $content);
1256+
$content = str_replace('{ssl_on}', 'ssl', $content);
12571257
$content = str_replace('{ssl_comment}', '', $content);
12581258
$content = str_replace('{fastcgi_ssl}', 'on', $content);
12591259
} else {
1260-
$content = str_replace('{ssl_on}', ' off', $content);
1260+
$content = str_replace('{ssl_on}', '', $content);
12611261
$content = str_replace('{ssl_comment}', '#', $content);
12621262
$content = str_replace('{fastcgi_ssl}', 'off', $content);
12631263
}

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ public function configure_apps_vhost()
785785
$content = str_replace('{cgi_socket}', $cgi_socket, $content);
786786

787787
// SSL in apps vhost is off by default. Might change later.
788-
$content = str_replace('{ssl_on}', 'off', $content);
788+
$content = str_replace('{ssl_on}', 'ssl', $content);
789789
$content = str_replace('{ssl_comment}', '#', $content);
790790

791791
wf($vhost_conf_dir.'/apps.vhost', $content);
@@ -1139,11 +1139,11 @@ public function install_ispconfig()
11391139
$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
11401140

11411141
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
1142-
$content = str_replace('{ssl_on}', ' on', $content);
1142+
$content = str_replace('{ssl_on}', 'ssl', $content);
11431143
$content = str_replace('{ssl_comment}', '', $content);
11441144
$content = str_replace('{fastcgi_ssl}', 'on', $content);
11451145
} else {
1146-
$content = str_replace('{ssl_on}', ' off', $content);
1146+
$content = str_replace('{ssl_on}', '', $content);
11471147
$content = str_replace('{ssl_comment}', '#', $content);
11481148
$content = str_replace('{fastcgi_ssl}', 'off', $content);
11491149
}

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,11 +1264,11 @@ public function install_ispconfig()
12641264
$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
12651265

12661266
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
1267-
$content = str_replace('{ssl_on}', ' on', $content);
1267+
$content = str_replace('{ssl_on}', 'ssl', $content);
12681268
$content = str_replace('{ssl_comment}', '', $content);
12691269
$content = str_replace('{fastcgi_ssl}', 'on', $content);
12701270
} else {
1271-
$content = str_replace('{ssl_on}', ' off', $content);
1271+
$content = str_replace('{ssl_on}', '', $content);
12721272
$content = str_replace('{ssl_comment}', '#', $content);
12731273
$content = str_replace('{fastcgi_ssl}', 'off', $content);
12741274
}

‎install/lib/installer_base.lib.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2131,7 +2131,7 @@ public function configure_apps_vhost() {
21312131
$content = str_replace('{use_socket}', $use_socket, $content);
21322132

21332133
// SSL in apps vhost is off by default. Might change later.
2134-
$content = str_replace('{ssl_on}', 'off', $content);
2134+
$content = str_replace('{ssl_on}', '', $content);
21352135
$content = str_replace('{ssl_comment}', '#', $content);
21362136

21372137
// Fix socket path on PHP 7 systems
@@ -2564,11 +2564,11 @@ public function install_ispconfig() {
25642564
$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
25652565

25662566
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
2567-
$content = str_replace('{ssl_on}', 'on', $content);
2567+
$content = str_replace('{ssl_on}', 'ssl', $content);
25682568
$content = str_replace('{ssl_comment}', '', $content);
25692569
$content = str_replace('{fastcgi_ssl}', 'on', $content);
25702570
} else {
2571-
$content = str_replace('{ssl_on}', 'off', $content);
2571+
$content = str_replace('{ssl_on}', '', $content);
25722572
$content = str_replace('{ssl_comment}', '#', $content);
25732573
$content = str_replace('{fastcgi_ssl}', 'off', $content);
25742574
}

‎install/tpl/nginx_apps.vhost.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
server {
2-
listen {apps_vhost_port};
3-
listen [::]:{apps_vhost_port} ipv6only=on;
4-
ssl {ssl_on};
2+
listen {apps_vhost_port} {ssl_on};
3+
listen [::]:{apps_vhost_port} {ssl_on} ipv6only=on;
4+
55
{ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
66
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
77
{ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;

‎install/tpl/nginx_ispconfig.vhost.master‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
server {
2-
listen {vhost_port};
3-
listen [::]:{vhost_port} ipv6only=on;
4-
ssl {ssl_on};
2+
listen {vhost_port} {ssl_on};
3+
listen [::]:{vhost_port} {ssl_on} ipv6only=on;
4+
55
{ssl_comment}ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
66
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
77
{ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;

0 commit comments

Comments
 (0)