- Fixed syntax error in fedora.lib.php on line 870.

ftimme

2011-09-28 491e359757fbfbc48823fa0d2ef71b71e4eed835

 server/plugins-available/nginx_plugin.inc.php

@@ -567,7 +567,7 @@
         }

         //* add the nginx user to the client group
         $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
         $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['nginx_user']));

         $this->_exec('chown '.$username.':'.$groupname.' '.escapeshellcmd($data['new']['document_root']));

@@ -638,7 +638,9 @@
      $vhost_data['web_document_root'] = $data['new']['document_root'].'/web';
      $vhost_data['web_document_root_www'] = $web_config['website_basedir'].'/'.$data['new']['domain'].'/web';
      $vhost_data['web_basedir'] = $web_config['website_basedir'];
      $vhost_data['ssl_domain'] = $data['new']['ssl_domain'];
		
      // IPv6
      if($data['new']['ipv6_address'] != '') $tpl->setVar('ipv6_enabled', 1);
      
      // PHP-FPM
      $pool_dir = escapeshellcmd($web_config['php_fpm_pool_dir']);
@@ -648,17 +650,17 @@
      if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
      
      if($data['new']['php_fpm_use_socket'] == 'y'){
         $use_tcp = '#';
         $use_socket = '';
         $use_tcp = 0;
         $use_socket = 1;
      } else {
         $use_tcp = '';
         $use_socket = '#';
         $use_tcp = 1;
         $use_socket = 0;
      }
      $tpl->setVar('use_tcp', $use_tcp);
      $tpl->setVar('use_socket', $use_socket);
      $fpm_socket = $socket_dir.$pool_name.'.sock';
      $tpl->setVar('fpm_socket', $fpm_socket);
      $vhost_data['fpm_port'] = $web_config['php_fpm_start_port'] + $data['new']['domain_id'] + 1;
      $vhost_data['fpm_port'] = $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1;
      
      // Custom nginx directives
      $final_nginx_directives = array();
@@ -1113,12 +1115,12 @@
      $tpl->newTemplate('php_fpm_pool.conf.master');

      if($data['new']['php_fpm_use_socket'] == 'y'){
         $use_tcp = ';';
         $use_socket = '';
         $use_tcp = 0;
         $use_socket = 1;
         if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
      } else {
         $use_tcp = '';
         $use_socket = ';';
         $use_tcp = 1;
         $use_socket = 0;
      }
      $tpl->setVar('use_tcp', $use_tcp);
      $tpl->setVar('use_socket', $use_socket);
@@ -1127,9 +1129,14 @@
      $tpl->setVar('fpm_socket', $fpm_socket);
         
      $tpl->setVar('fpm_pool', $pool_name);
      $tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] + 1);
      $tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);
      $tpl->setVar('fpm_user', $data['new']['system_user']);
      $tpl->setVar('fpm_group', $data['new']['system_group']);
      $tpl->setVar('pm_max_children', $data['new']['pm_max_children']);
      $tpl->setVar('pm_start_servers', $data['new']['pm_start_servers']);
      $tpl->setVar('pm_min_spare_servers', $data['new']['pm_min_spare_servers']);
      $tpl->setVar('pm_max_spare_servers', $data['new']['pm_max_spare_servers']);
      $tpl->setVar('document_root', $data['new']['document_root']);
      $tpl->setVar('security_level',$web_config['security_level']);
      $php_open_basedir = ($data['new']['php_open_basedir'] == '')?escapeshellcmd($data['new']['document_root']):escapeshellcmd($data['new']['php_open_basedir']);
      $tpl->setVar('php_open_basedir', $php_open_basedir);