summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2015-05-20 08:39:04 (GMT)
committerHerman van Rink2015-05-20 08:39:48 (GMT)
commitacdd6ed3f7a00c949533f5323f3d0249637873ab (patch)
tree5c5da65a0f27d879b4f8d35560f7e8e7b3cf4893
parent8586a7ba54870b0ef205f896afa60c0e53e811bc (diff)
Fix protection of files dir for multi-site
-rw-r--r--http/Provision/Config/Apache/Ssl/vhost_ssl.tpl.php2
-rw-r--r--http/Provision/Config/Apache/subdir.tpl.php2
-rw-r--r--http/Provision/Config/Apache/vhost.tpl.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/http/Provision/Config/Apache/Ssl/vhost_ssl.tpl.php b/http/Provision/Config/Apache/Ssl/vhost_ssl.tpl.php
index 052132e..2d19346 100644
--- a/http/Provision/Config/Apache/Ssl/vhost_ssl.tpl.php
+++ b/http/Provision/Config/Apache/Ssl/vhost_ssl.tpl.php
@@ -59,7 +59,7 @@ if ($this->redirection) {
<?php print $extra_config; ?>
# Error handler for Drupal > 4.6.7
- <Directory "<?php print $this->site_path; ?>/files">
+ <Directory ~ "sites/.*/files">
<Files *>
SetHandler This_is_a_Drupal_security_line_do_not_remove
</Files>
diff --git a/http/Provision/Config/Apache/subdir.tpl.php b/http/Provision/Config/Apache/subdir.tpl.php
index 36a5fc8..2f06e2c 100644
--- a/http/Provision/Config/Apache/subdir.tpl.php
+++ b/http/Provision/Config/Apache/subdir.tpl.php
@@ -25,7 +25,7 @@ Alias /<?php print $subdir; ?> <?php print $this->root; ?>
</Location>
# Error handler for Drupal > 4.6.7
-<Directory "<?php print $this->site_path; ?>/files">
+<Directory ~ "sites/.*/files">
SetHandler This_is_a_Drupal_security_line_do_not_remove
</Directory>
diff --git a/http/Provision/Config/Apache/vhost.tpl.php b/http/Provision/Config/Apache/vhost.tpl.php
index 52c422f..fabaae1 100644
--- a/http/Provision/Config/Apache/vhost.tpl.php
+++ b/http/Provision/Config/Apache/vhost.tpl.php
@@ -56,7 +56,7 @@ if ($this->redirection || $ssl_redirection) {
<?php print $extra_config; ?>
# Error handler for Drupal > 4.6.7
- <Directory "<?php print $this->site_path; ?>/files">
+ <Directory ~ "sites/.*/files">
<Files *>
SetHandler This_is_a_Drupal_security_line_do_not_remove
</Files>