Skip to content

Commit 5b4cab7

Browse files
committed
Fixes #6862 Inconsistent webserver check in installer/updater (installer_base.lib.php)
1 parent b233d14 commit 5b4cab7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

install/lib/installer_base.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,7 +2901,7 @@ public function configure_apps_vhost() {
29012901
//copy('tpl/nginx_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
29022902
//* and create the symlink
29032903
if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
2904-
if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
2904+
if(file_exists($vhost_conf_dir.'/apps.vhost') && is_dir($vhost_conf_enabled_dir) && !@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
29052905
symlink($vhost_conf_dir.'/apps.vhost', $vhost_conf_enabled_dir.'/000-apps.vhost');
29062906
}
29072907
}
@@ -2981,7 +2981,7 @@ public function make_acme_vhost($server = 'apache') {
29812981
if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {
29822982
unlink($vhost_conf_enabled_dir.'/' . $use_symlink);
29832983
}
2984-
if(!@is_file($vhost_conf_enabled_dir.'/' . $use_symlink)) {
2984+
if(file_exists($vhost_conf_dir.'/' . $use_name) && is_dir($vhost_conf_enabled_dir) && !@is_file($vhost_conf_enabled_dir.'/' . $use_symlink)) {
29852985
symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);
29862986
}
29872987
}

0 commit comments

Comments
 (0)