Merged revisions 2741-2788 from SVN stable branch.

tbrehm

2011-11-21 edf806b98d675a2037b019644aff76b7e8b7738c

 install/dist/lib/fedora.lib.php

@@ -581,7 +581,7 @@
      exec('mkdir -p '.$conf['nginx']['vhost_conf_enabled_dir']);
      exec('mkdir -p '.$conf['nginx']['vhost_conf_dir']);

      wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*;");
      wf('/etc/nginx/conf.d/ispconfig_vhosts.conf',"include /etc/nginx/sites-enabled/*.vhost;");

      //* make sure that webalizer finds its config file when it is directly in /etc
      if(@is_file('/etc/webalizer.conf') && !@is_dir('/etc/webalizer')) {
@@ -857,13 +857,23 @@
      if($conf['apache']['installed'] == true){
         $command = 'usermod -a -G ispconfig '.$conf['apache']['user'];
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         if(is_group('ispapps')){
            $command = 'usermod -a -G ispapps '.$conf['apache']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
      }
      if($conf['nginx']['installed'] == true){
         $command = 'usermod -a -G ispconfig '.$conf['nginx']['user'];
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         // Allow the ISPConfig vhost access to /etc/squirrelmail
         $command = 'usermod -a -G '.$conf['apache']['group'].' ispconfig';
         caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         //if(is_user('ispapps')){
            // Allow the ispapps vhost access to /etc/squirrelmail
            //$command = 'usermod -a -G '.$conf['apache']['group'].' ispapps';
            //caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         //}
         if(is_group('ispapps')){
            $command = 'usermod -a -G ispapps '.$conf['nginx']['user'];
            caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
         }
      }
      
      //* Make the shell scripts executable
@@ -942,7 +952,13 @@
            $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);
         
@@ -952,7 +968,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);
@@ -965,6 +982,9 @@
               symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
            }
         }
			
         // create symlink from /usr/share/phpmyadmin to /usr/share/phpMyAdmin, if it is installed
         if(!@file_exists('/usr/share/phpmyadmin') && @is_dir('/usr/share/phpMyAdmin')) symlink('/usr/share/phpMyAdmin/','/usr/share/phpmyadmin');
      }
      
      // Make the Clamav log files readable by ISPConfig
@@ -1009,6 +1029,11 @@
      // Edit the file Edit the file /etc/sudoers and comment out the requiregetty line, otherwise the backup function will fail
      replaceLine('/etc/sudoers','Defaults    requiretty','#Defaults    requiretty',0,0);
      
      if(is_file($install_dir.'/interface/invoices')) {
         chmod($install_dir.'/interface/invoices', 0770);
         chown($install_dir.'/interface/invoices', 'ispconfig');
         chgrp($install_dir.'/interface/invoices', 'ispconfig');
      }
      
   }