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

- place redirect to vhost content if documentroot is a domain, fixes #89

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-03-25 06:51:02 +00:00
parent bb6860532c
commit a3a3dec68c
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,19 +313,31 @@ class lighttpd
$ipport = $domain['ip'] . ':' . $domain['port']; $ipport = $domain['ip'] . ':' . $domain['port'];
} }
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true);
$vhost_content.= $this->getServerNames($domain) . " {\n"; $vhost_content.= $this->getServerNames($domain) . " {\n";
$vhost_content.= $this->getWebroot($domain, $ssl_vhost);
if(preg_match('/^https?\:\/\//', $domain['documentroot']))
{
$vhost_content.= ' url.redirect = (' . "\n";
$vhost_content.= ' "^/(.*)$" => "'. $this->idnaConvert->encode($domain['documentroot']) . '"/$1'. "\n";
$vhost_content.= ' )' . "\n";
}
else
{
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true);
$vhost_content.= $this->getWebroot($domain, $ssl_vhost);
$vhost_content.= $this->create_htaccess($domain);
$vhost_content.= $this->create_pathOptions($domain);
$vhost_content.= $this->composePhpOptions($domain);
$vhost_content.= $this->getStats($domain);
$vhost_content.= $this->getLogFiles($domain);
}
if ($domain['specialsettings'] != "") { if ($domain['specialsettings'] != "") {
$vhost_content.= $domain['specialsettings'] . "\n"; $vhost_content.= $domain['specialsettings'] . "\n";
} }
$vhost_content.= $this->create_htaccess($domain);
$vhost_content.= $this->create_pathOptions($domain);
$vhost_content.= $this->composePhpOptions($domain);
$vhost_content.= $this->getStats($domain);
$vhost_content.= $this->getLogFiles($domain);
$vhost_content.= '}' . "\n"; $vhost_content.= '}' . "\n";
return $vhost_content; return $vhost_content;
} }