Fix exporting of DNS variables for acme.sh (#4202)

Thom · Thom · commit 4fd5fddc3e4d · 2023-02-05T22:09:21.000+01:00
diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php
@@ -88,13 +88,13 @@ public function get_acme_command($domains, $key_file, $bundle_file, $cert_file,
 				$dns_ISPC_Api_Insecure = "0";
 			}
 			$dns_variables = array();
-			$dns_variables[] = "ISPC_User=" . $dns_ISPC_User;
-			$dns_variables[] = "ISPC_Password=" . $dns_ISPC_Password;
-			$dns_variables[] = "ISPC_Api=" . $dns_ISPC_Api;
-			$dns_variables[] = "ISPC_Api_Insecure=" . $dns_ISPC_Api_Insecure;
+			$dns_variables[] = "ISPC_User='" . $dns_ISPC_User . "'";
+			$dns_variables[] = "ISPC_Password='" . $dns_ISPC_Password . "'";
+			$dns_variables[] = "ISPC_Api='" . $dns_ISPC_Api . "'";
+			$dns_variables[] = "ISPC_Api_Insecure='" . $dns_ISPC_Api_Insecure . "'";
 			$dns_variables_cmd = '';
 			foreach($dns_variables as $dns_variable) {
-				$dns_variables_cmd .= $dns_variable . ' ; ';
+				$dns_variables_cmd .= "export " . $dns_variable . ' ; ';
 			}
 			$dns = ' --dns dns_ispconfig ';
 		}

Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,13 @@ public function get_acme_command($domains, $key_file, $bundle_file, $cert_file,`
`88`	`88`	`$dns_ISPC_Api_Insecure = "0";`
`89`	`89`	`}`
`90`	`90`	`$dns_variables = array();`
`91`		`- $dns_variables[] = "ISPC_User=" . $dns_ISPC_User;`
`92`		`- $dns_variables[] = "ISPC_Password=" . $dns_ISPC_Password;`
`93`		`- $dns_variables[] = "ISPC_Api=" . $dns_ISPC_Api;`
`94`		`- $dns_variables[] = "ISPC_Api_Insecure=" . $dns_ISPC_Api_Insecure;`
	`91`	`+ $dns_variables[] = "ISPC_User='" . $dns_ISPC_User . "'";`
	`92`	`+ $dns_variables[] = "ISPC_Password='" . $dns_ISPC_Password . "'";`
	`93`	`+ $dns_variables[] = "ISPC_Api='" . $dns_ISPC_Api . "'";`
	`94`	`+ $dns_variables[] = "ISPC_Api_Insecure='" . $dns_ISPC_Api_Insecure . "'";`
`95`	`95`	`$dns_variables_cmd = '';`
`96`	`96`	`foreach($dns_variables as $dns_variable) {`
`97`		`- $dns_variables_cmd .= $dns_variable . ' ; ';`
	`97`	`+ $dns_variables_cmd .= "export " . $dns_variable . ' ; ';`
`98`	`98`	`}`
`99`	`99`	`$dns = ' --dns dns_ispconfig ';`
`100`	`100`	`}`