[tor-commits] [webwml/master] Simplify redirect rules a bunch

[sebastian at torproject.org]

commit a469854636ebc8f7e8353af95799403148a2dd53
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Nov 23 01:12:52 2016 +0100

    Simplify redirect rules a bunch
---
 .htaccess | 54 ++++++------------------------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)

diff --git a/.htaccess b/.htaccess
index 3608c30..d691784 100644
--- a/.htaccess
+++ b/.htaccess
@@ -70,52 +70,10 @@ RewriteRule ^js/$ / [R=301,L]
 
 # Donation campagin
 # 2016
-RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-button(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-download(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate.html.en https://donate.torproject.org [R=302,L]
-
-# 2015
-RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-banner(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/giving-tue-blog(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-roger(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-george-torwell(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-molly(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-rabbirob(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-cory(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-hpbanner(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-benw(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-ellsberg(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-alison(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-snowden(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-appelbaum(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-chaos(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-nanni(.*) /donate/donate$1 [R=302,L]
-RewriteRule ^donate/donate-blog-landau(.*) /donate/donate$1 [R=302,L]
-#keep prefixes of other entries down here...
-RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
-
-# yuck, https://twitter.com/torproject/status/677928074630049793
-RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
+# Special-case the donate-options page so it doesn't get redirected
+RewriteRule ^donate/donate-options(.*) /donate/donate-options$1 [L]
+RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq.html [R=302,L]
+RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/donor-privacy-policy.html [R=302,L]
+