Commit 421e49a3 authored by Jon Pugh's avatar Jon Pugh

Fixing platform apache config to always include .htaccess. It's not readable...

Fixing platform apache config to always include .htaccess. It's not readable if provision script user home doesn't match the actual servers path (eg in the docker containers).
parent b08e5f7c
......@@ -8,11 +8,19 @@
<?php
if (is_readable("{$root}/.htaccess")) {
print "\n# Include the platform's htaccess file\n";
print "Include {$root}/.htaccess\n";
}
// @TODO: This has to be changed, because it's possible $root points to a different folder.
// $root here is /var/aegir/x because it's inside the container.
// If the current user is not running at /var/aegir, $root does not exist.
// So for now, we're adding the include .htaccess directive no matter what.
// if (is_readable("{$root}/.htaccess")) {
// print "\n# Include the platform's htaccess file\n";
// print "Include {$root}/.htaccess\n";
// }
?>
# Include the platform's htaccess file
Include <?php print $root ?>/.htaccess
# Do not read any .htaccess in the platform
AllowOverride none
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment