maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix vhost-merging of specialsettings in nginx; fixes #757

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-11-22 16:12:11 +01:00
parent d2852fbd5d
commit d24056c925
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Cron/Http/Nginx.php
View File

@@ -537,7 +537,7 @@ class Nginx extends HttpConfigBase
} }
if ($domain['ssl_specialsettings'] != '' && $ssl_vhost == true) { if ($domain['ssl_specialsettings'] != '' && $ssl_vhost == true) {
$vhost_content .= $this->processSpecialConfigTemplate($domain['ssl_specialsettings'], $domain, $domain['ip'], $domain['port'], $ssl_vhost) . "\n"; $vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate($domain['ssl_specialsettings'], $domain, $domain['ip'], $domain['port'], $ssl_vhost));
} }
if ($_vhost_content != '') { if ($_vhost_content != '') {
@@ -549,7 +549,7 @@ class Nginx extends HttpConfigBase
} }
if (Settings::Get('system.default_sslvhostconf') != '' && $ssl_vhost == true) { if (Settings::Get('system.default_sslvhostconf') != '' && $ssl_vhost == true) {
$vhost_content .= $this->processSpecialConfigTemplate(Settings::Get('system.default_sslvhostconf'), $domain, $domain['ip'], $domain['port'], $ssl_vhost) . "\n"; $vhost_content = $this->mergeVhostCustom($vhost_content, $this->processSpecialConfigTemplate(Settings::Get('system.default_sslvhostconf'), $domain, $domain['ip'], $domain['port'], $ssl_vhost) . "\n");
} }
} }
} }
@@ -562,6 +562,8 @@ class Nginx extends HttpConfigBase
{ {
// Remove windows linebreaks // Remove windows linebreaks
$vhost = str_replace("\r", "\n", $vhost); $vhost = str_replace("\r", "\n", $vhost);
// remove comments
$vhost = implode("\n", preg_replace('/^(\s+)?#(.*)$/', '', explode("\n", $vhost)));
// Break blocks into lines // Break blocks into lines
$vhost = str_replace(array( $vhost = str_replace(array(
"{", "{",