Carsten Schoene
2014-01-04 e6abfe7cab6d4465d5b2a68854a8a4dd30c49d0a
server/plugins-available/apache2_plugin.inc.php
@@ -2626,7 +2626,12 @@
         }
         $content = '';
         $content .= "Include \"".$awstats_conf_dir."/awstats.conf\"\n";
         if (is_file($awstats_conf_dir."/awstats.conf")) {
            $include_file = $awstats_conf_dir."/awstats.conf";
         } elseif (is_file($awstats_conf_dir."/awstats.model.conf")) {
            $include_file = $awstats_conf_dir."/awstats.model.conf";
         }
         $content .= "Include \"".$include_file\"\n";
         $content .= "LogFile=\"/var/log/ispconfig/httpd/".$data['new']['domain']."/access.log\"\n";
         $content .= "SiteDomain=\"".$data['new']['domain']."\"\n";
         $content .= "HostAliases=\"www.".$data['new']['domain']."  localhost 127.0.0.1\"\n";
@@ -2719,6 +2724,7 @@
      $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('fpm_domain', $data['new']['domain']);
      $tpl->setVar('pm', $data['new']['pm']);
      $tpl->setVar('pm_max_children', $data['new']['pm_max_children']);
      $tpl->setVar('pm_start_servers', $data['new']['pm_start_servers']);