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

actually use the new setting for custom directory options file content, refs #1638

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-07-14 08:36:14 +02:00
parent 8366e57512
commit 3d2cb879b0
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,13 +81,23 @@ class apache extends HttpConfigBase {
}
$this->virtualhosts_data[$vhosts_filename].= ' <Directory "' . makeCorrectDir(Settings::Get('system.documentroot_prefix')) . '">' . "\n";
// >=apache-2.4 enabled?
if (Settings::Get('system.apache24') == '1') {
$this->virtualhosts_data[$vhosts_filename].= ' Require all granted' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' AllowOverride All' . "\n";
} else {
$this->virtualhosts_data[$vhosts_filename].= ' Order allow,deny' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' allow from all' . "\n";
// check for custom values, see #1638
$custom_opts = Settings::Get('system.apacheglobaldiropt');
if (!empty($custom_opts))
{
$this->virtualhosts_data[$vhosts_filename].= $custom_opts;
}
else
{
// >=apache-2.4 enabled?
if (Settings::Get('system.apache24') == '1') {
$this->virtualhosts_data[$vhosts_filename].= ' Require all granted' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' AllowOverride All' . "\n";
} else {
$this->virtualhosts_data[$vhosts_filename].= ' Order allow,deny' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' allow from all' . "\n";
}
}
$this->virtualhosts_data[$vhosts_filename].= ' </Directory>' . "\n";
}