Commit bc58de74 authored by Till Brehm's avatar Till Brehm

Fixed: #4359 SSL Bundle certificates can not be saved

parent 72c52298
......@@ -415,14 +415,13 @@ class apache2_plugin {
//* Write new ssl files
if(trim($data["new"]["ssl_request"]) != '') $app->system->file_put_contents($csr_file, $data["new"]["ssl_request"]);
if(version_compare($app->system->getapacheversion(true), '2.4.8', '>=')) {
// In apache 2.4.8 and newer, the ssl crt file contains the bundle, so we need no separate bundle file
$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"];
$app->system->file_put_contents($bundle_file, $data["new"]["ssl_bundle"]);
}
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 {
// Write separate crt and bundle file
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"]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment