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

Author: Marius Burkard

install/lib/installer_base.lib.php

@@ -2946,7 +2946,7 @@ public function make_ispconfig_ssl_cert() {
 			}
 
 			// 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

server/lib/classes/letsencrypt.inc.php

@@ -80,7 +80,7 @@ public function get_acme_command($domains, $key_file, $bundle_file, $cert_file,
 	}
 
 	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;