Merge branch '6106-site-enable-symlink-always-created' into 'develop'

Marius Burkard · Marius Burkard · commit 126aa5e17cbe · 2021-03-25T16:24:03.000Z
Resolve "site-enable symlink always created"

Closes #6106

See merge request ispconfig/ispconfig3!1447
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2778,7 +2778,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_link($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
`@@ -2778,7 +2778,7 @@ public function make_acme_vhost($server = 'apache') {`
`2778`	`2778`	`if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
`2779`	`2779`	`unlink($vhost_conf_enabled_dir.'/' . $use_symlink);`
`2780`	`2780`	`}`
`2781`		`- if(!@is_link($vhost_conf_enabled_dir.'' . $use_symlink)) {`
	`2781`	`+ if(!@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
`2782`	`2782`	`symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);`
`2783`	`2783`	`}`
`2784`	`2784`	`}`