Commit 1373a52c authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6172-reverse-search-order-for-certbot-and-letsencrypt-binary' into 'develop'

Resolve "Reverse search order for certbot and letsencrypt binary"

Closes #6172

See merge request ispconfig/ispconfig3!1485
parents 2a958a7a 7d4db1da
......@@ -2946,7 +2946,7 @@ class installer_base {
}
// Get the default LE client name and version
$le_client = explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt /opt/eff.org/certbot/venv/bin/certbot'));
$le_client = explode("\n", shell_exec('which certbot /root/.local/share/letsencrypt/bin/letsencrypt /opt/eff.org/certbot/venv/bin/certbot letsencrypt'));
$le_client = reset($le_client);
// Check for Neilpang acme.sh as well
......
......@@ -80,7 +80,7 @@ class letsencrypt {
}
public function get_certbot_script() {
$letsencrypt = explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt /opt/eff.org/certbot/venv/bin/certbot'));
$letsencrypt = explode("\n", shell_exec('which certbot /root/.local/share/letsencrypt/bin/letsencrypt /opt/eff.org/certbot/venv/bin/certbot letsencrypt'));
$letsencrypt = reset($letsencrypt);
if(is_executable($letsencrypt)) {
return $letsencrypt;
......
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