resolves should resolve FS#1981 replaced "listen ... ssl;" through "ssl on;...

Bimon

2012-01-12 f9b8d0ab8f734fd1a25d1b12b71e35e4d926da98

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

@@ -1847,11 +1847,11 @@
            $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);
            }

 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;