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

Merge pull request #304 from Churro/froxlorMerge_f437f92

Browse Source 
Apache 2.4: Add AllowOverride All, otherwise Apache ignores .htaccess files
This commit is contained in:
Michael Kaufmann
2016-02-21 08:18:44 +01:00
parent 5c90c3aa97 268b188133
commit e8489e55a1
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,6 +84,7 @@ class apache extends HttpConfigBase {
// >=apache-2.4 enabled? // >=apache-2.4 enabled?
if (Settings::Get('system.apache24') == '1') { if (Settings::Get('system.apache24') == '1') {
$this->virtualhosts_data[$vhosts_filename].= ' Require all granted' . "\n"; $this->virtualhosts_data[$vhosts_filename].= ' Require all granted' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' AllowOverride All' . "\n";
} else { } else {
$this->virtualhosts_data[$vhosts_filename].= ' Order allow,deny' . "\n"; $this->virtualhosts_data[$vhosts_filename].= ' Order allow,deny' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' allow from all' . "\n"; $this->virtualhosts_data[$vhosts_filename].= ' allow from all' . "\n";
@@ -230,6 +231,7 @@ class apache extends HttpConfigBase {
// for this path, as this would be the first require and therefore grant all access // for this path, as this would be the first require and therefore grant all access
if ($mypath_dir->isUserProtected() == false) { if ($mypath_dir->isUserProtected() == false) {
$this->virtualhosts_data[$vhosts_filename].= ' Require all granted' . "\n"; $this->virtualhosts_data[$vhosts_filename].= ' Require all granted' . "\n";
$this->virtualhosts_data[$vhosts_filename].= ' AllowOverride All' . "\n";
} }
} else { } else {
$this->virtualhosts_data[$vhosts_filename].= ' Order allow,deny' . "\n"; $this->virtualhosts_data[$vhosts_filename].= ' Order allow,deny' . "\n";
@@ -284,6 +286,7 @@ class apache extends HttpConfigBase {
// for this path, as this would be the first require and therefore grant all access // for this path, as this would be the first require and therefore grant all access
if ($mypath_dir->isUserProtected() == false) { if ($mypath_dir->isUserProtected() == false) {
$this->virtualhosts_data[$vhosts_filename] .= ' Require all granted' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' Require all granted' . "\n";
$this->virtualhosts_data[$vhosts_filename] .= ' AllowOverride All' . "\n";
} }
} else { } else {
$this->virtualhosts_data[$vhosts_filename] .= ' Order allow,deny' . "\n"; $this->virtualhosts_data[$vhosts_filename] .= ' Order allow,deny' . "\n";
@@ -1049,6 +1052,7 @@ class apache extends HttpConfigBase {
// for this path, as this would be the first require and therefore grant all access // for this path, as this would be the first require and therefore grant all access
if ($mypath_dir->isUserProtected() == false) { if ($mypath_dir->isUserProtected() == false) {
$this->diroptions_data[$diroptions_filename] .= ' Require all granted' . "\n"; $this->diroptions_data[$diroptions_filename] .= ' Require all granted' . "\n";
//$this->diroptions_data[$diroptions_filename] .= ' AllowOverride All' . "\n";
} }
} else { } else {
$this->diroptions_data[$diroptions_filename] .= ' Order allow,deny' . "\n"; $this->diroptions_data[$diroptions_filename] .= ' Order allow,deny' . "\n";

3
scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
View File

@@ -55,6 +55,7 @@ class apache_fcgid extends apache
if ($mypath_dir->isUserProtected() == false) { if ($mypath_dir->isUserProtected() == false) {
$php_options_text.= ' <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n"; $php_options_text.= ' <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n";
$php_options_text.= ' Require all granted' . "\n"; $php_options_text.= ' Require all granted' . "\n";
$php_options_text.= ' AllowOverride All' . "\n";
$php_options_text.= ' </Directory>' . "\n"; $php_options_text.= ' </Directory>' . "\n";
} }
@@ -73,6 +74,7 @@ class apache_fcgid extends apache
// for this path, as this would be the first require and therefore grant all access // for this path, as this would be the first require and therefore grant all access
if ($mypath_dir->isUserProtected() == false) { if ($mypath_dir->isUserProtected() == false) {
$php_options_text.= ' Require all granted' . "\n"; $php_options_text.= ' Require all granted' . "\n";
$php_options_text.= ' AllowOverride All' . "\n";
} }
} else { } else {
$php_options_text.= ' Order allow,deny' . "\n"; $php_options_text.= ' Order allow,deny' . "\n";
@@ -110,6 +112,7 @@ class apache_fcgid extends apache
// for this path, as this would be the first require and therefore grant all access // for this path, as this would be the first require and therefore grant all access
if ($mypath_dir->isUserProtected() == false) { if ($mypath_dir->isUserProtected() == false) {
$php_options_text.= ' Require all granted' . "\n"; $php_options_text.= ' Require all granted' . "\n";
$php_options_text.= ' AllowOverride All' . "\n";
} }
} else { } else {
$php_options_text.= ' Order allow,deny' . "\n"; $php_options_text.= ' Order allow,deny' . "\n";