From f9b8d0ab8f734fd1a25d1b12b71e35e4d926da98 Mon Sep 17 00:00:00 2001 From: Bimon Date: Thu, 12 Jan 2012 19:09:33 +0000 Subject: [PATCH] resolves should resolve FS#1981 replaced "listen ... ssl;" through "ssl on;" in nginx (ispconfig.vhost) in case that ssl is used for ispconfig --- install/lib/installer_base.lib.php | 4 ++-- install/tpl/nginx_ispconfig.vhost.master | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 7508ad4c3..0c122a451 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1847,11 +1847,11 @@ class installer_base { $content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content); if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) { - $content = str_replace('{ssl_on}', ' ssl', $content); + $content = str_replace('{ssl_on}', 'on', $content); $content = str_replace('{ssl_comment}', '', $content); $content = str_replace('{fastcgi_ssl}', 'on', $content); } else { - $content = str_replace('{ssl_on}', '', $content); + $content = str_replace('{ssl_on}', 'off', $content); $content = str_replace('{ssl_comment}', '#', $content); $content = str_replace('{fastcgi_ssl}', 'off', $content); } diff --git a/install/tpl/nginx_ispconfig.vhost.master b/install/tpl/nginx_ispconfig.vhost.master index 22947cc58..28b19eb30 100644 --- a/install/tpl/nginx_ispconfig.vhost.master +++ b/install/tpl/nginx_ispconfig.vhost.master @@ -1,5 +1,6 @@ server { - listen {vhost_port}{ssl_on}; + listen {vhost_port}; + ssl {ssl_on}; {ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt; {ssl_comment}ssl_certificate_key /usr/local/ispconfig/interface/ssl/ispserver.key; -- GitLab