Merge branch '6134-acme-sh-switching-to-zerossl-by-default-should-be-set-to-let-s-encrypt' into 'develop'

Resolve "Acme.sh switching to ZeroSSL by default -> should be set to Let's Encrypt"

Closes #6134

See merge request ispconfig/ispconfig3!1462

Author: Marius Burkard

install/install.php

@@ -597,6 +597,9 @@
     }
 }
 
+// update acme.sh if installed
+$inst->update_acme();
+
 if($conf['services']['web'] == true) {
 	//** Configure apps vhost
 	swriteln('Configuring Apps vhost');

install/lib/installer_base.lib.php

@@ -51,6 +51,21 @@ private function install_acme() {
 		return ($val == 0 ? true : false);
 	}
 
+	public function update_acme() {
+		$acme = explode("\n", shell_exec('which /usr/local/ispconfig/server/scripts/acme.sh /root/.acme.sh/acme.sh'));
+		$acme = reset($acme);
+		$val = 0;
+
+		if($acme && is_executable($acme)) {
+			$cmd = $acme . ' --upgrade --auto-upgrade ; ' . $acme . ' --set-default-ca --server letsencrypt';
+			$ret = null;
+			$val = 0;
+			exec($cmd. ' 2>&1', $ret, $val);
+		}
+
+		return ($val == 0 ? true : false);
+	}
+
 	//: TODO  Implement the translation function and language files for the installer.
 	public function lng($text) {
 		return $text;
@@ -2939,6 +2954,9 @@ public function make_ispconfig_ssl_cert() {
 					$acme = reset($acme);
 					if($acme && is_executable($acme)) {
 						swriteln('Installed acme.sh and using it for certificate creation during install.');
+
+						// we do this even on install to enable automatic updates
+						$this->update_acme();
 					} else {
 						swriteln('Failed installing acme.sh. Will not be able to issue certificate during install.');
 					}

install/update.php

@@ -566,6 +566,9 @@
     }
 }
 
+// update acme.sh if installed
+$inst->update_acme();
+
 $inst->install_ispconfig();
 
 // Cleanup