ISPConfig3 devel
blame | history | patch | commit | commitdiff | ignore whitespace
Marius Cramer
2014-01-22 8133de09d462f8221deefa29ef67877c6676d84d 
 server/plugins-available/apache2_plugin.inc.php


@@ -930,6 +930,7 @@


      }




      $tpl->setVar($vhost_data);


      $tpl->setVar('apache_version', $app->system->getapacheversion());




      // Rewrite rules


      $rewrite_rules = array();


@@ -1136,6 +1137,7 @@




         $fcgi_tpl = new tpl();


         $fcgi_tpl->newTemplate('php-fcgi-starter.master');


         $fcgi_tpl->setVar('apache_version', $app->system->getapacheversion());




         // Support for multiple PHP versions (FastCGI)


         if(trim($data['new']['fastcgi_php_version']) != ''){


@@ -1275,6 +1277,7 @@




         $cgi_tpl = new tpl();


         $cgi_tpl->newTemplate('php-cgi-starter.master');


         $cgi_tpl->setVar('apache_version', $app->system->getapacheversion());




         // This works because PHP "rewrites" a symlink to the physical path


         $php_open_basedir = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir'];


@@ -1909,6 +1912,7 @@




      $tpl = new tpl();


      $tpl->newTemplate('apache_ispconfig.conf.master');


      $tpl->setVar('apache_version', $app->system->getapacheversion());


      $records = $app->db->queryAllRecords('SELECT * FROM server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");




      $records_out= array();


@@ -2609,7 +2613,8 @@


      $app->load('tpl');


      $tpl = new tpl();


      $tpl->newTemplate('php_fpm_pool.conf.master');




      $tpl->setVar('apache_version', $app->system->getapacheversion());


		


      if($data['new']['php_fpm_use_socket'] == 'y'){


         $use_tcp = 0;


         $use_socket = 1;