Commit 8b7aa53c authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'patch-3' into 'develop'

Update installer_base.lib.php to fix the missed svr_ip

See merge request !1147
parents 6477cf68 c87a1c8e
......@@ -2761,9 +2761,7 @@ class installer_base {
// Request for certs if no LE SSL folder for server fqdn exist
$le_live_dir = '/etc/letsencrypt/live/' . $hostname;
if (!@is_dir($le_live_dir) && (
($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips))
)) {
if (!@is_dir($le_live_dir) && (($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips)))) {
// This script is needed earlier to check and open http port 80 or standalone might fail
// Make executable and temporary symlink latest letsencrypt pre, post and renew hook script before install
......@@ -2865,7 +2863,7 @@ class installer_base {
$date = new DateTime();
// If the LE SSL certs for this hostname exists
if (is_dir($le_live_dir) && in_array($svr_ip, $dns_ips)) {
if (is_dir($le_live_dir) && (($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips)))) {
// Backup existing ispserver ssl files
if (file_exists($ssl_crt_file)) rename($ssl_crt_file, $ssl_crt_file . '-' .$date->format('YmdHis') . '.bak');
......
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