Skip to content

Commit f9b8d0a

Browse files
BimonBimon
authored andcommitted
resolves should resolve FS#1981
replaced "listen ... ssl;" through "ssl on;" in nginx (ispconfig.vhost) in case that ssl is used for ispconfig
1 parent 346f607 commit f9b8d0a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

install/lib/installer_base.lib.php

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

18491849
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
1850-
$content = str_replace('{ssl_on}', ' ssl', $content);
1850+
$content = str_replace('{ssl_on}', 'on', $content);
18511851
$content = str_replace('{ssl_comment}', '', $content);
18521852
$content = str_replace('{fastcgi_ssl}', 'on', $content);
18531853
} else {
1854-
$content = str_replace('{ssl_on}', '', $content);
1854+
$content = str_replace('{ssl_on}', 'off', $content);
18551855
$content = str_replace('{ssl_comment}', '#', $content);
18561856
$content = str_replace('{fastcgi_ssl}', 'off', $content);
18571857
}

install/tpl/nginx_ispconfig.vhost.master

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
server {
2-
listen {vhost_port}{ssl_on};
2+
listen {vhost_port};
3+
ssl {ssl_on};
34
{ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;
45
{ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key;
56

0 commit comments

Comments
 (0)