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

don't include specialsettings or default-vhost-content to ssl-redirects, fixes #1136

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-04 10:29:28 +02:00
parent 3d79564fd2
commit 551c1616f5
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -812,22 +812,19 @@ class apache
$vhost_content.= $this->getStats($domain); $vhost_content.= $this->getStats($domain);
} }
$vhost_content.= $this->getLogfiles($domain); $vhost_content.= $this->getLogfiles($domain);
}
if($domain['specialsettings'] != '') if ($domain['specialsettings'] != '') {
{
$vhost_content.= $domain['specialsettings'] . "\n"; $vhost_content.= $domain['specialsettings'] . "\n";
} }
if($ipandport['default_vhostconf_domain'] != '') if ($ipandport['default_vhostconf_domain'] != '') {
{
$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n"; $vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
} }
if($this->settings['system']['default_vhostconf'] != '') if ($this->settings['system']['default_vhostconf'] != '') {
{
$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n"; $vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
} }
}
$vhost_content.= '</VirtualHost>' . "\n"; $vhost_content.= '</VirtualHost>' . "\n";
return $vhost_content; return $vhost_content;

16
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -467,23 +467,19 @@ class lighttpd
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true); mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true, true);
$only_webroot = false; $only_webroot = false;
if($ssl_vhost === false && $domain['ssl_redirect'] == '1') if ($ssl_vhost === false
{ && $domain['ssl_redirect'] == '1'
) {
$only_webroot = true; $only_webroot = true;
} }
$vhost_content.= $this->getWebroot($domain, $ssl_vhost); $vhost_content.= $this->getWebroot($domain, $ssl_vhost);
if(!$only_webroot) if (!$only_webroot) {
{
if ($this->_deactivated == false) { if ($this->_deactivated == false) {
$vhost_content.= $this->create_htaccess($domain); $vhost_content.= $this->create_htaccess($domain);
$vhost_content.= $this->create_pathOptions($domain); $vhost_content.= $this->create_pathOptions($domain);
$vhost_content.= $this->composePhpOptions($domain); $vhost_content.= $this->composePhpOptions($domain);
$vhost_content.= $this->getStats($domain); $vhost_content.= $this->getStats($domain);
$vhost_content.= $this->getSslSettings($domain, $ssl_vhost); $vhost_content.= $this->getSslSettings($domain, $ssl_vhost);
}
$vhost_content.= $this->getLogFiles($domain);
}
}
if ($domain['specialsettings'] != "") { if ($domain['specialsettings'] != "") {
$vhost_content.= $domain['specialsettings'] . "\n"; $vhost_content.= $domain['specialsettings'] . "\n";
@@ -496,6 +492,10 @@ class lighttpd
if ($this->settings['system']['default_vhostconf'] != '') { if ($this->settings['system']['default_vhostconf'] != '') {
$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n"; $vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
} }
}
$vhost_content.= $this->getLogFiles($domain);
}
}
$vhost_content.= '}' . "\n"; $vhost_content.= '}' . "\n";

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

@@ -411,9 +411,12 @@ class nginx
} }
$vhost_content = ''; $vhost_content = '';
$vhost_content.= 'server { ' . "\n";
$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n";
// open vhost-container
$vhost_content.= 'server { ' . "\n";
// listening statement (required)
$vhost_content.= "\t" . 'listen ' . $ipport . ';' . "\n";
// get all server-names
$vhost_content.= $this->getServerNames($domain); $vhost_content.= $this->getServerNames($domain);
// respect ssl_redirect settings, #542 // respect ssl_redirect settings, #542
@@ -424,12 +427,10 @@ class nginx
$domain['documentroot'] = 'https://' . $domain['domain'] . '/'; $domain['documentroot'] = 'https://' . $domain['domain'] . '/';
} }
if(preg_match('/^https?\:\/\//', $domain['documentroot'])) // if the documentroot is an URL we just redirect
{ if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$vhost_content.= "\t".'rewrite ^(.*) '.$this->idnaConvert->encode($domain['documentroot']).'$1 permanent;'."\n"; $vhost_content.= "\t".'rewrite ^(.*) '.$this->idnaConvert->encode($domain['documentroot']).'$1 permanent;'."\n";
} } else {
else
{
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true); mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true);
$vhost_content.= $this->getLogFiles($domain); $vhost_content.= $this->getLogFiles($domain);