installer: fix checked wrong cert files for removal

jnorell · jnorell · commit 91c3b7d9a63a · 2021-11-17T07:47:31.000-07:00
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -3133,8 +3133,7 @@ public function make_ispconfig_ssl_cert() {
 						// certbot returns with 0 on issue for already existing certificate
 
 						$acme_cert_dir = '/etc/letsencrypt/live/' . $hostname;
-						foreach (array( 'fullchain.pem', 'privkey.pem' ) as $f) {
-							$f = $acme_cert_dir . '/' . $f;
+						foreach (array( $ssl_crt_file, $ssl_key_file) as $f) {
 							if (file_exists($f) && ! is_link($f)) {
 								unlink($f);
 							}

Original file line number	Diff line number	Diff line change
`@@ -3133,8 +3133,7 @@ public function make_ispconfig_ssl_cert() {`
`3133`	`3133`	`// certbot returns with 0 on issue for already existing certificate`
`3134`	`3134`
`3135`	`3135`	`$acme_cert_dir = '/etc/letsencrypt/live/' . $hostname;`
`3136`		`- foreach (array( 'fullchain.pem', 'privkey.pem' ) as $f) {`
`3137`		`- $f = $acme_cert_dir . '/' . $f;`
	`3136`	`+ foreach (array( $ssl_crt_file, $ssl_key_file) as $f) {`
`3138`	`3137`	`if (file_exists($f) && ! is_link($f)) {`
`3139`	`3138`	`unlink($f);`
`3140`	`3139`	`}`