Merge branch '6127-nginx-ispconfig-vhost-apps-vhost-http2-parameter-incorrect-behavior-after-update' into 'develop'

Resolve "nginx ispconfig.vhost/apps.vhost http2 parameter incorrect behavior after update"

Closes #6127

See merge request ispconfig/ispconfig3!1461

Author: Marius Burkard

install/lib/installer_base.lib.php

@@ -2627,7 +2627,7 @@ public function configure_apps_vhost() {
 
 			// Enable SSL if a cert is in place.
 			if(is_file($conf['ispconfig_install_dir'].'/interface/ssl/ispserver.crt') && is_file($conf['ispconfig_install_dir'].'/interface/ssl/ispserver.key')) {
-				$content = str_replace('{ssl_on}', 'ssl', $content);
+				$content = str_replace('{ssl_on}', 'ssl http2', $content);
 				$content = str_replace('{ssl_comment}', '', $content);
 			} else {
 				$content = str_replace('{ssl_on}', '', $content);
@@ -3524,7 +3524,7 @@ public function install_ispconfig() {
 			$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
 
 			if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
-				$content = str_replace('{ssl_on}', 'ssl', $content);
+				$content = str_replace('{ssl_on}', 'ssl http2', $content);
 				$content = str_replace('{ssl_comment}', '', $content);
 				$content = str_replace('{fastcgi_ssl}', 'on', $content);
 			} else {

install/tpl/nginx_apps.vhost.master

@@ -1,6 +1,6 @@
 server {
-        listen {apps_vhost_ip}{apps_vhost_port} {ssl_on} http2;
-        listen [::]:{apps_vhost_port} {ssl_on} ipv6only=on http2;
+        listen {apps_vhost_ip}{apps_vhost_port} {ssl_on};
+        listen [::]:{apps_vhost_port} {ssl_on} ipv6only=on;
 
         {ssl_comment}ssl_protocols TLSv1.2;
         {ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;

install/tpl/nginx_ispconfig.vhost.master

@@ -1,6 +1,6 @@
 server {
-        listen {vhost_port} {ssl_on} http2;
-        listen [::]:{vhost_port} {ssl_on} ipv6only=on http2;
+        listen {vhost_port} {ssl_on};
+        listen [::]:{vhost_port} {ssl_on} ipv6only=on;
 
 		{ssl_comment}ssl_protocols TLSv1.2;
         {ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;

server/conf/nginx_apps.vhost.master

@@ -1,6 +1,6 @@
 server {
-        listen {apps_vhost_ip}{apps_vhost_port} {ssl_on} http2;
-        listen [::]:{apps_vhost_port} {ssl_on} ipv6only=on http2;
+        listen {apps_vhost_ip}{apps_vhost_port} {ssl_on};
+        listen [::]:{apps_vhost_port} {ssl_on} ipv6only=on;
 
         {ssl_comment}ssl_protocols TLSv1.2;
         {ssl_comment}ssl_certificate /usr/local/ispconfig/interface/ssl/ispserver.crt;

server/plugins-available/apps_vhost_plugin.inc.php

@@ -209,7 +209,7 @@ function update($event_name, $data) {
             /* Check if SSL should be enabled: */
             if(is_file('/usr/local/ispconfig/interface/ssl/ispserver.crt') && is_file('/usr/local/ispconfig/interface/ssl/ispserver.key')) {
 				$content = str_replace('{ssl_comment}', '', $content);
-				$content = str_replace('{ssl_on}', 'ssl', $content);
+				$content = str_replace('{ssl_on}', 'ssl http2', $content);
             } else {
 				$content = str_replace('{ssl_comment}', '#', $content);
 				$content = preg_replace('/(\s)\{ssl_on\}/', '', $content);