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

fix ssl setttings for rewrite vhosts on nginx, fixes #1568

Browse Source 
- previously the ssl settings were missing in rewrite vhosts
- this caused ssl errors for these hosts as the default certificate has been used instead of the vhost specific cert.
- this seem to only apply for nginx, not apache
This commit is contained in:
Christian Becker
2015-11-14 14:10:23 +01:00
parent 60cc071031
commit 6996f6516c
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -419,6 +419,14 @@ class nginx extends HttpConfigBase {
$domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/'; $domain['documentroot'] = 'https://' . $domain['domain'] . $_sslport . '/';
} }
// create ssl settings first since they are required for normal and redirect vhosts
if ($ssl_vhost === true
&& $domain['ssl'] == '1'
&& Settings::Get('system.use_ssl') == '1'
) {
$vhost_content.= "\n" . $this->composeSslSettings($domain) . "\n";
}
// if the documentroot is an URL we just redirect // if the documentroot is an URL we just redirect
if (preg_match('/^https?\:\/\//', $domain['documentroot'])) { if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$uri = $this->idnaConvert->encode($domain['documentroot']); $uri = $this->idnaConvert->encode($domain['documentroot']);
@@ -434,12 +442,6 @@ class nginx extends HttpConfigBase {
if ($this->_deactivated == false) { if ($this->_deactivated == false) {
if ($ssl_vhost === true
&& $domain['ssl'] == '1'
&& Settings::Get('system.use_ssl') == '1'
) {
$vhost_content.= $this->composeSslSettings($domain);
}
$vhost_content = $this->mergeVhostCustom($vhost_content, $this->create_pathOptions($domain)) . "\n"; $vhost_content = $this->mergeVhostCustom($vhost_content, $this->create_pathOptions($domain)) . "\n";
$vhost_content.= $this->composePhpOptions($domain, $ssl_vhost); $vhost_content.= $this->composePhpOptions($domain, $ssl_vhost);