Merge branch 'patch-2' into 'master'

Patch 2

See merge request ispconfig/ispconfig3!836

Author: Marius Burkard

install/lib/installer_base.lib.php

@@ -2017,7 +2017,7 @@ public function configure_apps_vhost() {
 			$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_on}', '', $content);
 			$content = str_replace('{ssl_comment}', '#', $content);
 
 			// Fix socket path on PHP 7 systems
@@ -2450,11 +2450,11 @@ 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}', 'on', $content);
+				$content = str_replace('{ssl_on}', ' ssl', $content);
 				$content = str_replace('{ssl_comment}', '', $content);
 				$content = str_replace('{fastcgi_ssl}', 'on', $content);
 			} else {
-				$content = str_replace('{ssl_on}', 'off', $content);
+				$content = str_replace('{ssl_on}', '', $content);
 				$content = str_replace('{ssl_comment}', '#', $content);
 				$content = str_replace('{fastcgi_ssl}', 'off', $content);
 			}