From 037bf6fe6decb63746fc7428802b3a4291193517 Mon Sep 17 00:00:00 2001
From: Michael Seevogel <git@michaelseevogel.de>
Date: Fri, 9 Oct 2020 14:09:34 +0200
Subject: [PATCH] Fix Nginx SSL placeholders in apps_vhost_plugin.inc.php
---
server/plugins-available/apps_vhost_plugin.inc.php | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php
index a8797c62af..567e12b2a8 100644
--- a/server/plugins-available/apps_vhost_plugin.inc.php
+++ b/server/plugins-available/apps_vhost_plugin.inc.php
@@ -204,6 +204,18 @@ class apps_vhost_plugin {
$use_tcp = '';
$use_socket = '#';
}
+
+ /* 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('{vhost_port}', $web_config['apps_vhost_port'], $content);
+ } else {
+ $content = str_replace('{ssl_comment}', '#', $content);
+ $content = preg_replace('/(\s)\{ssl_on\}/', '', $content);
+ $content = str_replace('{vhost_port}', $web_config['apps_vhost_port'], $content);
+ }
+
$content = str_replace('{use_tcp}', $use_tcp, $content);
$content = str_replace('{use_socket}', $use_socket, $content);
--
GitLab