diff --git a/lib/Froxlor/Cron/Http/Apache.php b/lib/Froxlor/Cron/Http/Apache.php index 921faf3d..6bc3e4b9 100644 --- a/lib/Froxlor/Cron/Http/Apache.php +++ b/lib/Froxlor/Cron/Http/Apache.php @@ -413,7 +413,7 @@ class Apache extends HttpConfigBase $this->virtualhosts_data[$vhosts_filename] .= $this->processSpecialConfigTemplate($row_ipsandports['ssl_specialsettings'], $domain, $row_ipsandports['ip'], $row_ipsandports['port'], $row_ipsandports['ssl'] == '1') . "\n"; } - if ($row_ipsandports['ssl_cert_file'] == '') { + if ($row_ipsandports['ssl_cert_file'] == '' || ! file_exists($row_ipsandports['ssl_cert_file'])) { $row_ipsandports['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); if (! file_exists($row_ipsandports['ssl_cert_file'])) { // explicitly disable ssl for this vhost @@ -950,7 +950,7 @@ class Apache extends HttpConfigBase } if ($ssl_vhost === true && $domain['ssl'] == '1' && Settings::Get('system.use_ssl') == '1') { - if ($domain['ssl_cert_file'] == '') { + if ($domain['ssl_cert_file'] == '' || ! file_exists($domain['ssl_cert_file'])) { $domain['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); if (! file_exists($domain['ssl_cert_file'])) { // explicitly disable ssl for this vhost diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php index 3e7338e3..b476f755 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -502,7 +502,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron if (is_dir($certificate_folder) && file_exists($ssl_file) && is_readable($ssl_file)) { $cert_data = openssl_x509_parse(file_get_contents($ssl_file)); - if ($cert_data['validTo_time_t'] > strtotime($cert_date)) { + if ($cert_data && $cert_data['validTo_time_t'] > strtotime($cert_date)) { return true; } } diff --git a/lib/Froxlor/Cron/Http/Lighttpd.php b/lib/Froxlor/Cron/Http/Lighttpd.php index 513efb95..5698ee0c 100644 --- a/lib/Froxlor/Cron/Http/Lighttpd.php +++ b/lib/Froxlor/Cron/Http/Lighttpd.php @@ -188,7 +188,7 @@ class Lighttpd extends HttpConfigBase $this->lighttpd_data[$vhost_filename] .= $this->processSpecialConfigTemplate($row_ipsandports['ssl_specialsettings'], $domain, $row_ipsandports['ip'], $row_ipsandports['port'], $row_ipsandports['ssl'] == '1') . "\n"; } - if ($row_ipsandports['ssl_cert_file'] == '') { + if ($row_ipsandports['ssl_cert_file'] == '' || ! file_exists($row_ipsandports['ssl_cert_file'])) { $row_ipsandports['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); if (! file_exists($row_ipsandports['ssl_cert_file'])) { // explicitly disable ssl for this vhost @@ -555,7 +555,7 @@ class Lighttpd extends HttpConfigBase $ssl_settings = ''; if ($ssl_vhost === true && $domain['ssl'] == '1' && (int) Settings::Get('system.use_ssl') == 1) { - if ($domain['ssl_cert_file'] == '') { + if ($domain['ssl_cert_file'] == '' || ! file_exists($domain['ssl_cert_file'])) { $domain['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); if (! file_exists($domain['ssl_cert_file'])) { // explicitly disable ssl for this vhost diff --git a/lib/Froxlor/Cron/Http/Nginx.php b/lib/Froxlor/Cron/Http/Nginx.php index b2358dd1..4325bb15 100644 --- a/lib/Froxlor/Cron/Http/Nginx.php +++ b/lib/Froxlor/Cron/Http/Nginx.php @@ -155,7 +155,7 @@ class Nginx extends HttpConfigBase // we know whether it's an ssl vhost or not $ssl_vhost = false; if ($row_ipsandports['ssl'] == '1') { - if ($row_ipsandports['ssl_cert_file'] == '') { + if ($row_ipsandports['ssl_cert_file'] == '' || ! file_exists($row_ipsandports['ssl_cert_file'])) { $row_ipsandports['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); if (! file_exists($row_ipsandports['ssl_cert_file'])) { // explicitly disable ssl for this vhost @@ -659,7 +659,7 @@ class Nginx extends HttpConfigBase { $sslsettings = ''; - if ($domain_or_ip['ssl_cert_file'] == '') { + if ($domain_or_ip['ssl_cert_file'] == '' || ! file_exists($domain_or_ip['ssl_cert_file'])) { $domain_or_ip['ssl_cert_file'] = Settings::Get('system.ssl_cert_file'); if (! file_exists($domain_or_ip['ssl_cert_file'])) { // explicitly disable ssl for this vhost