From 165152caf2e2ecb9625a5cf488cf87a5ea43f189 Mon Sep 17 00:00:00 2001 From: ftimme Date: Thu, 3 May 2012 13:38:35 +0000 Subject: [PATCH] - Make sure the apps vhost gets configured no matter if the ISPConfig interface is installed or not. --- install/dist/lib/gentoo.lib.php | 4 ++-- install/lib/installer_base.lib.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index eb764e1f4..deb03f300 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -561,7 +561,7 @@ class installer extends installer_base global $conf; //* Create the ispconfig apps vhost user and group - if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){ + if($conf['apache']['installed'] == true){ $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']); $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']); $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps'); @@ -619,7 +619,7 @@ class installer extends installer_base } } - if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){ + if($conf['nginx']['installed'] == true){ $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']); $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']); $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps'); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index cbabdee9a..4686aa3a0 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1420,7 +1420,7 @@ class installer_base { global $conf; //* Create the ispconfig apps vhost user and group - if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){ + if($conf['apache']['installed'] == true){ $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']); $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']); $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps'); @@ -1482,7 +1482,7 @@ class installer_base { } } - if($conf['nginx']['installed'] == true && $this->install_ispconfig_interface == true){ + if($conf['nginx']['installed'] == true){ $apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']); $apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']); $install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps'); -- GitLab