ftimme
2012-05-03 165152caf2e2ecb9625a5cf488cf87a5ea43f189
- Make sure the apps vhost gets configured no matter if the ISPConfig interface is installed or not.
2 files modified
8 ■■■■ changed files
install/dist/lib/gentoo.lib.php 4 ●●●● patch | view | raw | blame | history
install/lib/installer_base.lib.php 4 ●●●● patch | view | raw | blame | history
install/dist/lib/gentoo.lib.php
@@ -561,7 +561,7 @@
        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 @@
            
            }
        }
        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');
install/lib/installer_base.lib.php
@@ -1420,7 +1420,7 @@
        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 @@
            }
        }
        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');