From 7d3b76a0b5f053ee112e67b13458d7f67490caf8 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 15 Sep 2020 14:49:48 +0200
Subject: [PATCH] - fixed issues with acme path
---
install/lib/installer_base.lib.php | 8 ++++++++
server/scripts/letsencrypt_renew_hook.sh | 1 -
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 5c2d78c8c8..371b476f34 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2738,6 +2738,14 @@ class installer_base {
$tpl->setVar('apache_version',getapacheversion());
}
+ $acme_dir = $conf['ispconfig_install_dir'] . '/interface/acme';
+
+ //* Create the ISPConfig installation directory
+ if(!@is_dir($acme_dir)) {
+ $command = "mkdir -p $acme_dir";
+ caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ }
+
wf($vhost_conf_dir.'/acme.vhost', $tpl->grab());
if(@is_link($vhost_conf_enabled_dir.'/999-acme.vhost')) {
diff --git a/server/scripts/letsencrypt_renew_hook.sh b/server/scripts/letsencrypt_renew_hook.sh
index 0a71f30d01..9f3283587a 100644
--- a/server/scripts/letsencrypt_renew_hook.sh
+++ b/server/scripts/letsencrypt_renew_hook.sh
@@ -42,6 +42,5 @@ lelive=/etc/letsencrypt/live/$(hostname -f); if [ -d "$lelive" ]; then
if [ $(dpkg-query -W -f='${Status}' mariadb 2>/dev/null | grep -c "ok installed") -eq 1 ]; then service mysql restart; fi
if [ $(dpkg-query -W -f='${Status}' nginx 2>/dev/null | grep -c "ok installed") -eq 1 ]; then service nginx restart; fi
if [ $(dpkg-query -W -f='${Status}' apache2 2>/dev/null | grep -c "ok installed") -eq 1 ]; then service apache2 restart; fi
- else
fi
else echo `/bin/date` "Your Lets Encrypt SSL certs path for your ISPConfig server FQDN is missing.$line" >> /var/log/ispconfig/ispconfig.log; fi
\ No newline at end of file
--
GitLab