- certificate bundle is deprecated since apache 2.4.8

Marius Cramer

2014-10-09 f78f1e5d4e837b658b535d90c28c3a55df8e8a91

- certificate bundle is deprecated since apache 2.4.8

 server/conf/vhost.conf.master

@@ -55,7 +55,9 @@
        SSLCertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt
        SSLCertificateKeyFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key
<tmpl_if name='has_bundle_cert'>
        SSLCACertificateFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
        <tmpl_if name='apache_version' op='<' value='2.4.8' format='version'>
        SSLCertificateChainFile <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.bundle
        </tmpl_if>
</tmpl_if>
</tmpl_if>
        </IfModule>

 server/plugins-available/apache2_plugin.inc.php

@@ -335,8 +335,15 @@

            //* Write new ssl files
            if(trim($data["new"]["ssl_request"]) != '') $app->system->file_put_contents($csr_file, $data["new"]["ssl_request"]);
            if(trim($data["new"]["ssl_cert"]) != '') $app->system->file_put_contents($crt_file, $data["new"]["ssl_cert"]);
            if(trim($data["new"]["ssl_bundle"]) != '') $app->system->file_put_contents($bundle_file, $data["new"]["ssl_bundle"]);
            if(version_compare($app->system->getapacheversion(true), '2.4.8', '>=')) {
                $tmp_data = '';
                if(trim($data["new"]["ssl_cert"]) != '') $tmp_data .= $data["new"]["ssl_cert"] . "\n";
                if(trim($data["new"]["ssl_bundle"]) != '') $tmp_data .= $data["new"]["ssl_bundle"];
                if(trim($tmp_data) != '') $app->system->file_put_contents($crt_file, $tmp_data);
            } else {
                if(trim($data["new"]["ssl_cert"]) != '') $app->system->file_put_contents($crt_file, $data["new"]["ssl_cert"]);
                if(trim($data["new"]["ssl_bundle"]) != '') $app->system->file_put_contents($bundle_file, $data["new"]["ssl_bundle"]);
            }

            //* Write the key file, if field is empty then import the key into the db
            if(trim($data["new"]["ssl_key"]) != '') {