Merge branch 'jnorell-develop-patch-59936' into 'develop'

Marius Burkard · Marius Burkard · commit 48d4a49f3c69 · 2022-03-24T19:02:43.000Z
Avoid symlink() error if acme conf already exists as a file.

See merge request ispconfig/ispconfig3!1587
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2876,7 +2876,7 @@ public function make_acme_vhost($server = 'apache') {
 		if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {
 			unlink($vhost_conf_enabled_dir.'/' . $use_symlink);
 		}
-		if(!@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {
+		if(!@is_file($vhost_conf_enabled_dir.'/' . $use_symlink)) {
 			symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -2876,7 +2876,7 @@ public function make_acme_vhost($server = 'apache') {`
`2876`	`2876`	`if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
`2877`	`2877`	`unlink($vhost_conf_enabled_dir.'/' . $use_symlink);`
`2878`	`2878`	`}`
`2879`		`- if(!@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
	`2879`	`+ if(!@is_file($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
`2880`	`2880`	`symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);`
`2881`	`2881`	`}`
`2882`	`2882`	`}`