ftimme

2011-10-10 67a707831e6df413654c65bcf8ccc08d3bd5cd2c

 install/lib/installer_base.lib.php

@@ -118,7 +118,7 @@
      if(is_installed('mysql') || is_installed('mysqld')) $conf['mysql']['installed'] = true;
      if(is_installed('postfix')) $conf['postfix']['installed'] = true;
      if(is_installed('mailman')) $conf['mailman']['installed'] = true;
      if(is_installed('apache') || is_installed('apache2') || is_installed('httpd')) $conf['apache']['installed'] = true;
      if(is_installed('apache') || is_installed('apache2') || is_installed('httpd') || is_installed('httpd2')) $conf['apache']['installed'] = true;
      if(is_installed('getmail')) $conf['getmail']['installed'] = true;
      if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
      if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
@@ -674,7 +674,7 @@
      if(!is_file('/var/lib/mailman/data/aliases')) touch('/var/lib/mailman/data/aliases');
      exec('postalias /var/lib/mailman/data/aliases');
      if(!is_file('/var/lib/mailman/data/virtual-mailman')) touch('/var/lib/mailman/data/virtual-mailman');
      exec('postalias /var/lib/mailman/data/virtual-mailman');
      exec('postmap /var/lib/mailman/data/virtual-mailman');

      //* Make a backup copy of the main.cf file
      copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
@@ -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);

@@ -1472,20 +1480,27 @@
         } else {
            $apps_vhost_ip = $conf['web']['apps_vhost_ip'].':';
         }
			
         $socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
         if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
         if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
         $fpm_socket = $socket_dir.'apps.sock';

         $content = str_replace('{apps_vhost_ip}', $apps_vhost_ip, $content);
         $content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
         $content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
         $content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
         $content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
         //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);

         wf($vhost_conf_dir.'/apps.vhost', $content);
         
         // PHP-FPM
         // Dont just copy over the php-fpm pool template but add some custom settings
         $content = rf('tpl/php_fpm_pool.conf.master');
         $content = rf('tpl/apps_php_fpm_pool.conf.master');
         $content = str_replace('{fpm_pool}', 'apps', $content);
         $content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
         //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);
         $content = str_replace('{fpm_user}', $apps_vhost_user, $content);
         $content = str_replace('{fpm_group}', $apps_vhost_group, $content);
         wf($conf['nginx']['php_fpm_pool_dir'].'/apps.conf', $content);
@@ -1668,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']);

@@ -1737,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
@@ -1808,8 +1827,14 @@
            $content = str_replace('{fastcgi_ssl}', 'off', $content);
         }
         
         $content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);

         $socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
         if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
         if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
         $fpm_socket = $socket_dir.'ispconfig.sock';
			
         //$content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);
			
         wf($vhost_conf_dir.'/ispconfig.vhost', $content);
         
         unset($content);
@@ -1818,7 +1843,8 @@
         // Dont just copy over the php-fpm pool template but add some custom settings
         $content = rf('tpl/php_fpm_pool.conf.master');
         $content = str_replace('{fpm_pool}', 'ispconfig', $content);
         $content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
         //$content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
         $content = str_replace('{fpm_socket}', $fpm_socket, $content);
         $content = str_replace('{fpm_user}', 'ispconfig', $content);
         $content = str_replace('{fpm_group}', 'ispconfig', $content);
         wf($conf['nginx']['php_fpm_pool_dir'].'/ispconfig.conf', $content);