Merge branch 'master' of /home/git/repositories/grungy/ispconfig3

Marius Cramer

2014-01-02 b80a703a7fc421a49e6b892e805b6a70b9f8f386

 server/plugins-available/apache2_plugin.inc.php

@@ -1435,9 +1435,11 @@

      //* Add vhost for IPv6 IP
      if($data['new']['ipv6_address'] != '') {
         if ($conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') {
            if (isset($conf['serverconfig']['server']['v6_prefix']) && $conf['serverconfig']['server']['v6_prefix'] <> '') {
               $explode_v6prefix=explode(':', $conf['serverconfig']['server']['v6_prefix']);
         //* rewrite ipv6 on mirrors
         /* chang $conf to $web_config */
         if ($web_config['serverconfig']['web']['vhost_rewrite_v6'] == 'y') {
            if (isset($web_config['serverconfig']['server']['v6_prefix']) && $web_config['serverconfig']['server']['v6_prefix'] <> '') {
               $explode_v6prefix=explode(':', $web_config['serverconfig']['server']['v6_prefix']);
               $explode_v6=explode(':', $data['new']['ipv6_address']);

               for ( $i = 0; $i <= count($explode_v6prefix)-3; $i++ ) {
@@ -2717,6 +2719,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']);