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

Marius Burkard

2016-02-09 88ada4468829a87a4dd0ea706d422c3efcd279c5

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

 install/dist/lib/gentoo.lib.php

@@ -774,7 +774,11 @@
            //$content = str_replace('{fpm_port}', ($conf['nginx']['php_fpm_start_port']+1), $content);
            $content = str_replace('{fpm_socket}', $fpm_socket, $content);
            $content = str_replace('{cgi_socket}', $cgi_socket, $content);

			
            // SSL in apps vhost is off by default. Might change later.
            $content = str_replace('{ssl_on}', 'off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);
			
            wf($vhost_conf_dir.'/apps.vhost', $content);

            // PHP-FPM

 install/lib/installer_base.lib.php

@@ -2075,6 +2075,10 @@
            }
            $content = str_replace('{use_tcp}', $use_tcp, $content);
            $content = str_replace('{use_socket}', $use_socket, $content);
			
            // SSL in apps vhost is off by default. Might change later.
            $content = str_replace('{ssl_on}', 'off', $content);
            $content = str_replace('{ssl_comment}', '#', $content);

            wf($vhost_conf_dir.'/apps.vhost', $content);