Skip to content

Commit 89a6f6e

Browse files
committed
Update installer_base.lib.php to replace ssl on / off that is already deprecated in Nginx 1.15 with ' ssl' / '' and to change the same in nginx_ispconfig.vhost.master as well.
1 parent 0281760 commit 89a6f6e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

install/lib/installer_base.lib.php

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

23692369
// SSL in apps vhost is off by default. Might change later.
2370-
$content = str_replace('{ssl_on}', 'off', $content);
2370+
$content = str_replace('{ssl_on}', '', $content);
23712371
$content = str_replace('{ssl_comment}', '#', $content);
23722372

23732373
// Fix socket path on PHP 7 systems
@@ -2802,11 +2802,11 @@ public function install_ispconfig() {
28022802
$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
28032803

28042804
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
2805-
$content = str_replace('{ssl_on}', 'on', $content);
2805+
$content = str_replace('{ssl_on}', ' ssl', $content);
28062806
$content = str_replace('{ssl_comment}', '', $content);
28072807
$content = str_replace('{fastcgi_ssl}', 'on', $content);
28082808
} else {
2809-
$content = str_replace('{ssl_on}', 'off', $content);
2809+
$content = str_replace('{ssl_on}', '', $content);
28102810
$content = str_replace('{ssl_comment}', '#', $content);
28112811
$content = str_replace('{fastcgi_ssl}', 'off', $content);
28122812
}

0 commit comments

Comments
 (0)