Skip to content

Commit 165152c

Browse files
committed
- Make sure the apps vhost gets configured no matter if the ISPConfig interface is installed or not.
1 parent 7e1cfbe commit 165152c

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

install/dist/lib/gentoo.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ public function configure_apps_vhost()
561561
global $conf;
562562

563563
//* Create the ispconfig apps vhost user and group
564-
if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
564+
if($conf['apache']['installed'] == true){
565565
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
566566
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
567567
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
@@ -619,7 +619,7 @@ public function configure_apps_vhost()
619619

620620
}
621621
}
622-
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
622+
if($conf['nginx']['installed'] == true){
623623
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
624624
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
625625
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');

install/lib/installer_base.lib.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1420,7 +1420,7 @@ public function configure_apps_vhost() {
14201420
global $conf;
14211421

14221422
//* Create the ispconfig apps vhost user and group
1423-
if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
1423+
if($conf['apache']['installed'] == true){
14241424
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
14251425
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
14261426
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
@@ -1482,7 +1482,7 @@ public function configure_apps_vhost() {
14821482

14831483
}
14841484
}
1485-
if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){
1485+
if($conf['nginx']['installed'] == true){
14861486
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
14871487
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
14881488
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');

0 commit comments

Comments
 (0)