jenkins-bot has submitted this change and it was merged.

Change subject: delete .htaccess files for doc/integration
......................................................................


delete .htaccess files for doc/integration

Ief4a6a296c533bb moves the content of these files
over into the normal Apache config template in the puppet repo,
along with the rest of the config for these virtual hosts.

When that gets merged, delete the files over here.

Bug: T149928
Bug: T150727
Depends-On: Ief4a6a296c533bbb7bdb0f140fc4f71a60d2a5ca
Change-Id: I05ece775026557ed56701586cdffcff614d6f0a3
---
D org/wikimedia/doc/.htaccess
D org/wikimedia/integration/.htaccess
2 files changed, 0 insertions(+), 15 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Hashar: Looks good to me, approved
  jenkins-bot: Verified
  Dzahn: Looks good to me, but someone else must approve



diff --git a/org/wikimedia/doc/.htaccess b/org/wikimedia/doc/.htaccess
deleted file mode 100644
index ad84b12..0000000
--- a/org/wikimedia/doc/.htaccess
+++ /dev/null
@@ -1,10 +0,0 @@
-# Back-compat for T73060: Redirect mediawiki-core/master/php/html/ to 
mediawiki-core/master/php/
-RewriteEngine On
-RewriteRule ^mediawiki-core/master/php/html/(.*)$ 
https://doc.wikimedia.org/mediawiki-core/master/php/$1 [L,QSA]
-
-# DirectoryIndex would be neater, but doesn't work properly under Apache 2.2
-RewriteEngine on
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteCond %{REQUEST_FILENAME}/index.php !-f
-RewriteCond %{REQUEST_FILENAME}/index.html !-f
-RewriteRule .* dir.php
diff --git a/org/wikimedia/integration/.htaccess 
b/org/wikimedia/integration/.htaccess
deleted file mode 100644
index 12d1e30..0000000
--- a/org/wikimedia/integration/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-RewriteEngine On
-RewriteRule ^cover$ https://doc.wikimedia.org/cover/ [R=301,L]
-
-Redirect 301 /monitoring/ https://tools.wmflabs.org/nagf/?project=integration
-Redirect 301 /cover/ https://doc.wikimedia.org/cover/

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I05ece775026557ed56701586cdffcff614d6f0a3
Gerrit-PatchSet: 3
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
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