From 9c9a7d2ac863c8e78323c10c891147bfd0c7c6ae Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Wed, 12 Dec 2012 10:33:05 -0500 Subject: [PATCH] Implemented: FS#2582 - Add support for SSL bundle certificates (SSLCACertificateFile) in ispconfig apache vhost --- install/dist/lib/opensuse.lib.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 97a2a6f..2b3c225 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/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); -- Gitblit v1.9.1