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

outsource a few directory-functions in a class; make apache-2.4 not create 'require all granted' if there is an active directory-protection or option set for the customerroot-dir, possibly fixes #1455

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-12-01 08:07:28 +01:00
parent e24e8297f1
commit 3be43c4848
6 changed files with 144 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -826,7 +826,8 @@ class lighttpd {
fwrite($this->debugHandler, ' lighttpd::writeConfigs: rebuilding ' . Settings::Get('system.apacheconf_vhost') . "\n");
$this->logger->logAction(CRON_ACTION, LOG_INFO, "rebuilding " . Settings::Get('system.apacheconf_vhost'));
if (!isConfigDir(Settings::Get('system.apacheconf_vhost'))) {
$vhostDir = new frxDirectory(Settings::Get('system.apacheconf_vhost'));
if (!$vhostDir->isConfigDir()) {
// Save one big file
$vhosts_file = '';
@@ -871,7 +872,8 @@ class lighttpd {
}
// Write the diroptions
if (isConfigDir(Settings::Get('system.apacheconf_htpasswddir'))) {
$htpasswdDir = new frxDirectory(Settings::Get('system.apacheconf_htpasswddir'));
if ($htpasswdDir->isConfigDir()) {
foreach ($this->needed_htpasswds as $key => $data) {
if (!is_dir(Settings::Get('system.apacheconf_htpasswddir'))) {
mkdir(makeCorrectDir(Settings::Get('system.apacheconf_htpasswddir')));