Implemented: FS#2582 - Add support for SSL bundle certificates (SSLCACertif...

tbrehm

2012-12-12 9c9a7d2ac863c8e78323c10c891147bfd0c7c6ae

Implemented: FS#2582 - Add support for SSL bundle certificates (SSLCACertificateFile) in ispconfig apache vhost

 install/dist/lib/fedora.lib.php

@@ -941,6 +941,11 @@
            } else {
                $content = str_replace('{ssl_comment}', '#', $content);
            }
            if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
                $content = str_replace('{ssl_bundle_comment}', '', $content);
            } else {
                $content = str_replace('{ssl_bundle_comment}', '#', $content);
            }
        
            wf("$vhost_conf_dir/ispconfig.vhost", $content);
        

 install/dist/lib/gentoo.lib.php

@@ -929,6 +929,11 @@
            } else {
                $content = str_replace('{ssl_comment}', '#', $content);
            }
            if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
                $content = str_replace('{ssl_bundle_comment}', '', $content);
            } else {
                $content = str_replace('{ssl_bundle_comment}', '#', $content);
            }
        
            $vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
            $this->write_config_file($vhost_path, $content);

 install/dist/lib/opensuse.lib.php

@@ -977,6 +977,11 @@
            } else {
                $content = str_replace('{ssl_comment}', '#', $content);
            }
            if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
                $content = str_replace('{ssl_bundle_comment}', '', $content);
            } else {
                $content = str_replace('{ssl_bundle_comment}', '#', $content);
            }
        
            $content = str_replace('/var/www/', '/srv/www/', $content);
        

 install/lib/installer_base.lib.php

@@ -1885,6 +1885,11 @@
            } else {
                $content = str_replace('{ssl_comment}', '#', $content);
            }
            if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key') && is_file($install_dir.'/interface/ssl/ispserver.bundle')) {
                $content = str_replace('{ssl_bundle_comment}', '', $content);
            } else {
                $content = str_replace('{ssl_bundle_comment}', '#', $content);
            }

            wf($vhost_conf_dir.'/ispconfig.vhost', $content);


 install/tpl/apache_ispconfig.vhost.master

@@ -53,6 +53,7 @@
  {ssl_comment}SSLEngine On
  {ssl_comment}SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
  {ssl_comment}SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
  {ssl_bundle_comment}SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle

</VirtualHost>