- Fixed #1776.

ftimme

2011-10-10 6e9c073b9082d6b9d96e1ef7aedecefc33b02eee

 install/lib/installer_base.lib.php

@@ -1396,7 +1396,11 @@
         $command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

         if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
         if(!@is_dir($install_dir)){
            mkdir($install_dir, 0755, true);
         } else {
            chmod($install_dir, 0755);
         }
         chown($install_dir, $apps_vhost_user);
         chgrp($install_dir, $apps_vhost_group);

@@ -1455,7 +1459,11 @@
         $command = 'adduser '.$conf['nginx']['user'].' '.$apps_vhost_group;
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

         if(!@is_dir($install_dir)) mkdir($install_dir, 0755, true);
         if(!@is_dir($install_dir)){
            mkdir($install_dir, 0755, true);
         } else {
            chmod($install_dir, 0755);
         }
         chown($install_dir, $apps_vhost_user);
         chgrp($install_dir, $apps_vhost_group);

@@ -1675,13 +1683,9 @@
      $dns_server_enabled = ($conf['services']['dns'])?1:0;
      $file_server_enabled = ($conf['services']['file'])?1:0;
      $db_server_enabled = ($conf['services']['db'])?1:0;
      $vserver_server_enabled = ($conf['services']['vserver'])?1:0;
      $vserver_server_enabled = ($conf['openvz']['installed'])?1:0;
      $proxy_server_enabled = ($conf['services']['proxy'])?1:0;
      $firewall_server_enabled = ($conf['services']['firewall'])?1:0;





      $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled', proxy_server = '$proxy_server_enabled', firewall_server = '$firewall_server_enabled' WHERE server_id = ".intval($conf['server_id']);

@@ -1744,10 +1748,18 @@
      if($conf['apache']['installed'] == true){
         $command = 'adduser '.$conf['apache']['user'].' ispconfig';
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         if(is_group('ispapps')){
            $command = 'adduser '.$conf['apache']['user'].' ispapps';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
      }
      if($conf['nginx']['installed'] == true){
         $command = 'adduser '.$conf['nginx']['user'].' ispconfig';
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         if(is_group('ispapps')){
            $command = 'adduser '.$conf['nginx']['user'].' ispapps';
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
      }

      //* Make the shell scripts executable