- update for acme.sh if installed (also if not re-creating cert for ispc)

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

@@ -56,7 +56,7 @@ private function update_acme() {
 		$acme = reset($acme);
 		$val = 0;
 
-		if($acme) {
+		if($acme && is_executable($acme)) {
 			$cmd = $acme . ' --upgrade --auto-upgrade ; ' . $acme . ' --set-default-ca --server letsencrypt';
 			$ret = null;
 			$val = 0;
@@ -2932,17 +2932,15 @@ 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.');
 					}
 				}
 			}
 
-			if($acme && is_executable($acme)) {
-				// we do this even on install to enable automatic updates
-				$this->update_acme();
-			}
-
 			$restore_conf_symlink = false;
 
 			// we only need this for apache, so use fixed conf index

install/update.php

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