Commit 662d4cc6 authored by tbrehm's avatar tbrehm
Browse files

Fixed: FS#1831 - SSL Certificate setup fails unless you've visited the SSL tab in that session

parent ae47f0c0
......@@ -190,7 +190,7 @@ class apache2_plugin {
//* Save a SSL certificate to disk
if($data["new"]["ssl_action"] == 'save') {
$ssl_dir = $data["new"]["document_root"]."/ssl";
$domain = $data["new"]["ssl_domain"];
$domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
$csr_file = $ssl_dir.'/'.$domain.".csr";
$crt_file = $ssl_dir.'/'.$domain.".crt";
$bundle_file = $ssl_dir.'/'.$domain.".bundle";
......@@ -207,7 +207,7 @@ class apache2_plugin {
//* Delete a SSL certificate
if($data['new']['ssl_action'] == 'del') {
$ssl_dir = $data['new']['document_root'].'/ssl';
$domain = $data['new']['ssl_domain'];
$domain = ($data["new"]["ssl_domain"] != '')?$data["new"]["ssl_domain"]:$data["new"]["domain"];
$csr_file = $ssl_dir.'/'.$domain.'.csr';
$crt_file = $ssl_dir.'/'.$domain.'.crt';
$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
......@@ -228,7 +228,6 @@ class apache2_plugin {
$app->log('Deleting SSL Cert for: '.$domain,LOGLEVEL_DEBUG);
}
}
......
Supports Markdown
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