Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Till Brehm

2014-07-09 68b702b680cd7eacb5f6f3aaa3ef87e24fb0bd0d

 server/plugins-available/apache2_plugin.inc.php

@@ -2654,7 +2654,7 @@

      $fpm_socket = $socket_dir.$pool_name.'.sock';
      $tpl->setVar('fpm_socket', $fpm_socket);
      $tpl->setVar('fpm_listen_mode', '0600');
      $tpl->setVar('fpm_listen_mode', '0660');

      $tpl->setVar('fpm_pool', $pool_name);
      $tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] - 1);