Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/332385 )

Change subject: contint: import rewrite rule from integration/docroot
......................................................................


contint: import rewrite rule from integration/docroot

A previous change has dropped AllowOverride but we forgot to migrate the
.htaccess for https://doc.wikimedia.org/cover/.  Move it back in the
puppet configuration.

Bug: T150727
Change-Id: I208a595417e7ca674fbdd900c8909acfd07f48be
---
M modules/contint/templates/apache/doc.wikimedia.org.erb
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/modules/contint/templates/apache/doc.wikimedia.org.erb 
b/modules/contint/templates/apache/doc.wikimedia.org.erb
index 69ea38d..e95e26b 100644
--- a/modules/contint/templates/apache/doc.wikimedia.org.erb
+++ b/modules/contint/templates/apache/doc.wikimedia.org.erb
@@ -25,6 +25,12 @@
 
     DirectoryIndex index.html index.php
 
+    # DirectoryIndex would be neater but did not work properly under Apache 2.2
+    RewriteCond %{REQUEST_FILENAME} -d
+    RewriteCond %{REQUEST_FILENAME}/index.php !-f
+    RewriteCond %{REQUEST_FILENAME}/index.html !-f
+    RewriteRule .* dir.php
+
     <Directory />
         Require all granted
     </Directory>

-- 
To view, visit https://gerrit.wikimedia.org/r/332385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I208a595417e7ca674fbdd900c8909acfd07f48be
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to