Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/243347
Change subject: apache: remove wikidisclosure redirects
......................................................................
apache: remove wikidisclosure redirects
Change-Id: I51ad4bbcdc13dc044b587b0e2c6a161ff41863c3
---
M modules/mediawiki/files/apache/sites/redirects.conf
M modules/mediawiki/files/apache/sites/redirects/redirects.dat
2 files changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/243347/1
diff --git a/modules/mediawiki/files/apache/sites/redirects.conf
b/modules/mediawiki/files/apache/sites/redirects.conf
index 412c374..f62754d 100644
--- a/modules/mediawiki/files/apache/sites/redirects.conf
+++ b/modules/mediawiki/files/apache/sites/redirects.conf
@@ -173,10 +173,6 @@
ServerAlias *.wikimediacommons.pt
ServerAlias wikimediacommons.co.uk
ServerAlias *.wikimediacommons.co.uk
- ServerAlias wikidisclosure.com
- ServerAlias *.wikidisclosure.com
- ServerAlias wikidisclosure.org
- ServerAlias *.wikidisclosure.org
ServerAlias wikimaps.com
ServerAlias *.wikimaps.com
ServerAlias wikimaps.net
@@ -1433,18 +1429,6 @@
# rewrite *wikimediacommons.co.uk //commons.wikimedia.org
RewriteCond %{HTTP_HOST} ^(.+)\.wikimediacommons\.co\.uk$
RewriteRule ^[^\x00-\x1F]* %{ENV:RW_PROTO}://commons.wikimedia.org$0
[R=301,L,NE]
- # funnel *wikidisclosure.com //www.wikimedia.org
- RewriteCond %{HTTP_HOST} =wikidisclosure.com
- RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
- # funnel *wikidisclosure.com //www.wikimedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikidisclosure\.com$
- RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
- # funnel *wikidisclosure.org //www.wikimedia.org
- RewriteCond %{HTTP_HOST} =wikidisclosure.org
- RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
- # funnel *wikidisclosure.org //www.wikimedia.org
- RewriteCond %{HTTP_HOST} ^(.+)\.wikidisclosure\.org$
- RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
# funnel *wikimaps.com //www.wikimedia.org
RewriteCond %{HTTP_HOST} =wikimaps.com
RewriteRule . %{ENV:RW_PROTO}://www.wikimedia.org/ [R=301,L,NE]
diff --git a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
index 7ad29f1..7455316 100644
--- a/modules/mediawiki/files/apache/sites/redirects/redirects.dat
+++ b/modules/mediawiki/files/apache/sites/redirects/redirects.dat
@@ -343,8 +343,6 @@
rewrite bookshelf.wikimedia.org //outreach.wikimedia.org/wiki/Bookshelf
# Random acquired cruft
-funnel *wikidisclosure.com //www.wikimedia.org
-funnel *wikidisclosure.org //www.wikimedia.org
funnel *wikimaps.com //www.wikimedia.org
funnel *wikimaps.net //www.wikimedia.org
funnel *wikimaps.org //www.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/243347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51ad4bbcdc13dc044b587b0e2c6a161ff41863c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
